diff --git a/.gitea/workflows/convert-html-docs.yaml b/.gitea/workflows/convert-html-docs.yaml
index 589147e77..26ec27c9a 100644
--- a/.gitea/workflows/convert-html-docs.yaml
+++ b/.gitea/workflows/convert-html-docs.yaml
@@ -101,6 +101,7 @@ jobs:
     env:
       DOCS_UPDATE_DATA_FILE: metadata.yaml
       PROJECT_SRC_DIR: ./docs
+      TEMPLATE_DIR: ./templates
 
     steps:
       - name: Checkout source repo
@@ -284,7 +285,37 @@ jobs:
                       with open(os.environ['GITHUB_OUTPUT'], 'a') as fh:
                         fh.write(json.dumps(doc_parameters, indent=4))
                       # Export env vars for convert_doc command
-                      env_str = " ".join([f'{k}="{v}"' for k, v in env_vars.items() if v])
+                      convert_params = []
+          
+                      def add_param(key, flag=None):
+                          value = env_vars.get(key)
+                          if value:
+                              flag = flag or f"--{key.lower().replace('_', '-')}"
+                                  convert_params.append(f"{flag} '{value}'")
+          
+                      # Add all optional params
+                      add_param("DEST", "--dest")
+                      add_param("DOC_TITLE", "--title")
+                      add_param("DOC_SHORT_TITLE", "--doc-title")
+                      add_param("DOC_ENVIRONMENT", "--doc-environment")
+                      add_param("DOC_LINK", "--doc-link")
+                      add_param("DOC_TYPE", "--doc-type")
+                      add_param("DOC_SERVICE", "--service")
+                      add_param("DOC_SERVICE", "--service-title")  # reused intentionally
+                      add_param("DOC_SERVICE_CATEGORY", "--service-category")
+                      add_param("DOC_SERVICE_TYPE", "--service-type")
+                      add_param("DOC_REPO_NAME", "--repo-name")
+                      add_param("DOC_PDF_NAME", "--pdf-name")
+          
+                      # Always set this one (like in Ansible)
+                      convert_params.append(f"--templates-location {os.getenv('TEMPLATE_DIR')}")
+
+                      # Build final command
+                      source = env_vars["SOURCE"]
+                      #command = f"otc-convert-doc {' '.join(convert_params)} '{source}'"
+                      env_str = ' '.join(convert_params)} '{source}'"
+
+                      # env_str = " ".join([f'{k}="{v}"' for k, v in env_vars.items() if v])
           
                       print(f"Generating docs for {env_vars['DOC_LABEL']}")