diff --git a/roles/ocp4_workload_s4/defaults/main.yml b/roles/ocp4_workload_s4/defaults/main.yml
index f0475c3..914edee 100644
--- a/roles/ocp4_workload_s4/defaults/main.yml
+++ b/roles/ocp4_workload_s4/defaults/main.yml
@@ -76,8 +76,8 @@ ocp4_workload_s4_route_tls_termination: edge
 ocp4_workload_s4_route_tls_insecure_policy: Redirect
 
 # S3 API Route (enabled by default for S3 API access)
-ocp4_workload_s4_route_s3_api_enabled: true
-ocp4_workload_s4_route_s3_api_host: ""  # Auto-generated if empty
+ocp4_workload_s4_s3_api_enabled: true
+ocp4_workload_s4_s3_api_host: ""  # Auto-generated if empty
 
 # --------------------------------------------------
 # Bucket creation configuration
diff --git a/roles/ocp4_workload_s4/readme.adoc b/roles/ocp4_workload_s4/readme.adoc
index 4862d55..54ed711 100644
--- a/roles/ocp4_workload_s4/readme.adoc
+++ b/roles/ocp4_workload_s4/readme.adoc
@@ -80,7 +80,7 @@ Username and password can be passed in as parameters. If not provided, username
 * `ocp4_workload_s4_route_enabled`: Enable OpenShift Route for UI (default: `true`)
 * `ocp4_workload_s4_route_host`: Custom hostname (default: auto-generated)
 * `ocp4_workload_s4_route_tls_termination`: TLS termination (default: `edge`)
-* `ocp4_workload_s4_route_s3_api_enabled`: Enable Route for S3 API (default: `true`)
+* `ocp4_workload_s4_s3_api_enabled`: Enable Route for S3 API (default: `true`)
 
 === Bucket Creation
 
@@ -142,7 +142,7 @@ Username and password can be passed in as parameters. If not provided, username
       ocp4_workload_s4_storage_data_storage_class: ocs-storagecluster-ceph-rbd
       ocp4_workload_s4_access_key_id: my-access-key
       ocp4_workload_s4_secret_access_key: my-secret-key
-      ocp4_workload_s4_route_s3_api_enabled: true
+      ocp4_workload_s4_s3_api_enabled: true
       ocp4_workload_s4_buckets:
       - production-data
 ----
diff --git a/roles/ocp4_workload_s4/tasks/workload.yml b/roles/ocp4_workload_s4/tasks/workload.yml
index c0a6d86..58ace22 100644
--- a/roles/ocp4_workload_s4/tasks/workload.yml
+++ b/roles/ocp4_workload_s4/tasks/workload.yml
@@ -88,7 +88,7 @@
     _ocp4_workload_s4_route_url: "https://{{ r_s4_route.resources[0].spec.host }}"
 
 - name: Get S3 API route (if enabled)
-  when: ocp4_workload_s4_route_s3_api_enabled | bool
+  when: ocp4_workload_s4_s3_api_enabled | bool
   kubernetes.core.k8s_info:
     api_version: route.openshift.io/v1
     kind: Route
@@ -104,7 +104,7 @@
 
 - name: Set S3 API endpoint URL
   when:
-  - ocp4_workload_s4_route_s3_api_enabled | bool
+  - ocp4_workload_s4_s3_api_enabled | bool
   - r_s4_api_route.resources | length > 0
   ansible.builtin.set_fact:
     _ocp4_workload_s4_s3_api_endpoint_external: "https://{{ r_s4_api_route.resources[0].spec.host }}"
@@ -152,7 +152,7 @@
       - msg: "S3 Endpoint (internal): {{ _ocp4_workload_s4_s3_api_endpoint_internal }}"
         when: true
       - msg: "S3 Endpoint (external): {{ _ocp4_workload_s4_s3_api_endpoint_external }}"
-        when: "{{ ocp4_workload_s4_route_s3_api_enabled | bool and _ocp4_workload_s4_s3_api_endpoint_external is defined }}"
+        when: "{{ ocp4_workload_s4_s3_api_enabled | bool and _ocp4_workload_s4_s3_api_endpoint_external is defined }}"
       - msg: "S3 Buckets Created: {{ ocp4_workload_s4_buckets | join(', ') }}"
         when: "{{ ocp4_workload_s4_buckets | default([]) | length > 0 }}"
 
diff --git a/roles/ocp4_workload_s4/templates/application.yaml.j2 b/roles/ocp4_workload_s4/templates/application.yaml.j2
index 7801f2b..715e54c 100644
--- a/roles/ocp4_workload_s4/templates/application.yaml.j2
+++ b/roles/ocp4_workload_s4/templates/application.yaml.j2
@@ -92,10 +92,10 @@ spec:
 
           # S3 API Route
           s3Api:
-            enabled: {{ ocp4_workload_s4_route_s3_api_enabled | lower }}
-{% if ocp4_workload_s4_route_s3_api_enabled %}
-{% if ocp4_workload_s4_route_s3_api_host | length > 0 %}
-            host: {{ ocp4_workload_s4_route_s3_api_host }}
+            enabled: {{ ocp4_workload_s4_s3_api_enabled | lower }}
+{% if ocp4_workload_s4_s3_api_enabled %}
+{% if ocp4_workload_s4_s3_api_host | length > 0 %}
+            host: {{ ocp4_workload_s4_s3_api_host }}
 {% endif %}
             tls:
               termination: {{ ocp4_workload_s4_route_tls_termination }}