diff --git a/otc_metadata/templates/conf.py.j2 b/otc_metadata/templates/conf.py.j2
index a033a8b2..d527b655 100644
--- a/otc_metadata/templates/conf.py.j2
+++ b/otc_metadata/templates/conf.py.j2
@@ -126,9 +126,9 @@ html_copy_source = False
 
 # -- Options for PDF output --------------------------------------------------
 latex_documents = [
-{%- if pdf_name is defined %}
+{%- if doc_type %}
     ('index',
-     '{{ pdf_name }}.tex',
+     '{{ service_type }}-{{ doc_type }}.tex',
      u'{{ title }}',
      u'OpenTelekomCloud', 'manual'),
 {% endif -%}
diff --git a/otc_metadata/templates/tox.ini.j2 b/otc_metadata/templates/tox.ini.j2
index b31a1bbf..b3437e58 100644
--- a/otc_metadata/templates/tox.ini.j2
+++ b/otc_metadata/templates/tox.ini.j2
@@ -63,7 +63,7 @@ commands =
   wget -O {toxinidir}/_templates/tabular.tex.jinja https://gitea.eco.tsi-dev.otc-service.com/infra/docs-templates/raw/branch/main/templates/tabular.tex.jinja
   wget -O {toxinidir}/_templates/tabulary.tex.jinja https://gitea.eco.tsi-dev.otc-service.com/infra/docs-templates/raw/branch/main/templates/tabulary.tex.jinja
 {%- for doc in docs %}
-{%- if doc.pdf_name %}
+{%- if doc.pdf_enabled %}
   {[testenv:{{ doc.type }}-pdf-docs]commands}
 {%- endif %}
 {%- endfor %}
@@ -107,7 +107,7 @@ commands =
   cp -av doc/build/json/{{ doc.type }} {{ doc.type }}/build/json
 {%- endif %}
 
-{% if doc.pdf_name -%}
+{% if doc.pdf_enabled -%}
 # PDF version
 [testenv:{{ doc.type }}-pdf-docs]
 deps = {[testenv:docs]deps}
@@ -125,7 +125,7 @@ commands =
   bash -c "for f in {{ loc }}/build/pdf/*.tex; do sed -iorig 's/\.gif//g' $f; done"
   make -C {{ loc }}/build/pdf
   mkdir -p doc/build/pdf
-  cp {{ loc }}/build/pdf/{{ doc.pdf_name }}.pdf doc/build/pdf/
+  cp {{ loc }}/build/pdf/{{ service_type }}-{{ doc.type }}.pdf doc/build/pdf/
 {% endif %}
 {% endfor %}
 
diff --git a/tools/generate_doc_confpy.py b/tools/generate_doc_confpy.py
index a6e5cec4..385a3c1f 100644
--- a/tools/generate_doc_confpy.py
+++ b/tools/generate_doc_confpy.py
@@ -276,6 +276,7 @@ def process_repositories(args, service):
             context["docs"].append(doc)
 
         context["target_environment"] = args.target_environment
+        context["service_type"] = service['service_type']
 
         tox_ini_content = tox_ini_template.render(**context)
         tox_ini_path = pathlib.Path(copy_to, "tox.ini")