diff --git a/playbooks/base/post.yaml b/playbooks/base/post.yaml
index d2fa466..79e17dc 100644
--- a/playbooks/base/post.yaml
+++ b/playbooks/base/post.yaml
@@ -9,7 +9,6 @@
       name: upload-swift
     vars:
       zuul_log_path_shard_build: true
-      # zuul_log_cloud_config: '{{ serverstack_cloud }}'
       zuul_log_cloud_config: '{{ artifact_cloud }}'
       # zuul_log_partition: true
       # 15552000 is 30 days * 6, or ~ 6 months
diff --git a/playbooks/juju/cleanup.yaml b/playbooks/juju/cleanup.yaml
index a469e08..8ec1267 100644
--- a/playbooks/juju/cleanup.yaml
+++ b/playbooks/juju/cleanup.yaml
@@ -11,9 +11,9 @@
       failed_when: false
     - name: 'destroy controller'
       shell: >
-        timeout 120 juju destroy-controller --destroy-all-models --destroy-storage -y {{ serverstack_cloud.region_name }}-{{ serverstack_cloud.region_name }}
+        timeout 120 juju destroy-controller --destroy-all-models --destroy-storage -y {{ ps6_cloud.region_name }}-{{ ps6_cloud.region_name }}
       failed_when: false
     - name: 'kill controller'
       shell: >
-        juju kill-controller -t 120s -y {{ serverstack_cloud.region_name }}-{{ serverstack_cloud.region_name }}
+        juju kill-controller -t 120s -y {{ ps6_cloud.region_name }}-{{ ps6_cloud.region_name }}
       failed_when: false
diff --git a/playbooks/juju/post.yaml b/playbooks/juju/post.yaml
index 547f2d6..b9b1970 100644
--- a/playbooks/juju/post.yaml
+++ b/playbooks/juju/post.yaml
@@ -54,9 +54,9 @@
       failed_when: false
     - name: 'destroy controller'
       shell: >
-        timeout 240 juju destroy-controller --destroy-all-models --destroy-storage -y {{ serverstack_cloud.region_name }}-{{ serverstack_cloud.region_name }}
+        timeout 240 juju destroy-controller --destroy-all-models --destroy-storage -y {{ ps6_cloud.region_name }}-{{ ps6_cloud.region_name }}
       failed_when: false
     - name: 'kill controller'
       shell: >
-        juju kill-controller -t 120s -y {{ serverstack_cloud.region_name }}-{{ serverstack_cloud.region_name }}
+        juju kill-controller -t 120s -y {{ ps6_cloud.region_name }}-{{ ps6_cloud.region_name }}
       failed_when: false
diff --git a/playbooks/juju/templates/clouds.yaml.j2 b/playbooks/juju/templates/clouds.yaml.j2
index 5af47c9..1a1c229 100644
--- a/playbooks/juju/templates/clouds.yaml.j2
+++ b/playbooks/juju/templates/clouds.yaml.j2
@@ -1,8 +1,8 @@
 clouds:
-  {{ serverstack_cloud.region_name }}:
+  {{ ps6_cloud.region_name }}:
     type: openstack
     auth-types: [userpass]
-    endpoint: {{ serverstack_cloud.auth.auth_url }}
+    endpoint: {{ ps6_cloud.auth.auth_url }}
     regions:
-      {{ serverstack_cloud.region_name }}:
-        endpoint: {{ serverstack_cloud.auth.auth_url }}
\ No newline at end of file
+      {{ ps6_cloud.region_name }}:
+        endpoint: {{ ps6_cloud.auth.auth_url }}
diff --git a/playbooks/juju/templates/credentials.yaml.j2 b/playbooks/juju/templates/credentials.yaml.j2
index ecd26cf..173d219 100644
--- a/playbooks/juju/templates/credentials.yaml.j2
+++ b/playbooks/juju/templates/credentials.yaml.j2
@@ -1,10 +1,10 @@
 credentials:
-    {{ serverstack_cloud.region_name }}:
-        default-region: {{ serverstack_cloud.region_name }}
-        {{ serverstack_cloud.auth.username }}:
+    {{ ps6_cloud.region_name }}:
+        default-region: {{ ps6_cloud.region_name }}
+        {{ ps6_cloud.auth.username }}:
             auth-type: userpass
-            username: {{ serverstack_cloud.auth.username }}
-            password: {{ serverstack_cloud.auth.password }}
-            project-domain-name: {{ serverstack_cloud.auth.user_domain_name }}
-            tenant-name: {{ serverstack_cloud.auth.username }}
-            user-domain-name: {{ serverstack_cloud.auth.user_domain_name }}
\ No newline at end of file
+            username: {{ ps6_cloud.auth.username }}
+            password: {{ ps6_cloud.auth.password }}
+            project-domain-name: {{ ps6_cloud.auth.user_domain_name }}
+            tenant-name: {{ ps6_cloud.auth.username }}
+            user-domain-name: {{ ps6_cloud.auth.user_domain_name }}
diff --git a/roles/juju-setup/tasks/main.yaml b/roles/juju-setup/tasks/main.yaml
index d1f7f6c..1162d0f 100644
--- a/roles/juju-setup/tasks/main.yaml
+++ b/roles/juju-setup/tasks/main.yaml
@@ -64,13 +64,13 @@
     src: clouds.yaml.j2
     dest: clouds.yaml
 - name: Add cloud
-  command: /snap/bin/juju add-cloud --client {{ serverstack_cloud.region_name }} clouds.yaml
+  command: /snap/bin/juju add-cloud --client {{ ps6_cloud.region_name }} clouds.yaml
 - name: 'render credentials.yaml'
   template:
     src: credentials.yaml.j2
     dest: credentials.yaml
 - name: Add credential
-  command: /snap/bin/juju add-credential {{ serverstack_cloud.region_name }} --client -f credentials.yaml
+  command: /snap/bin/juju add-credential {{ ps6_cloud.region_name }} --client -f credentials.yaml
 - name: Clone charm-test-infra
   command: git clone https://github.com/openstack-charmers/charm-test-infra /home/ubuntu/charm-test-infra
 - name: 'Bootstrap Controller'
@@ -81,7 +81,7 @@
       --auto-upgrade=false \
       --model-default=/home/ubuntu/charm-test-infra/juju-configs/model-default-serverstack.yaml \
       --config=/home/ubuntu/charm-test-infra/juju-configs/controller-default.yaml \
-      {{ serverstack_cloud.region_name }}/{{ serverstack_cloud.region_name }}
+      {{ ps6_cloud.region_name }}/{{ ps6_cloud.region_name }}
 - name: 'Add default juju model if needed'
   shell:
     cmd: |
diff --git a/roles/upload-charm/tasks/main.yaml b/roles/upload-charm/tasks/main.yaml
index 77077b6..e928b62 100644
--- a/roles/upload-charm/tasks/main.yaml
+++ b/roles/upload-charm/tasks/main.yaml
@@ -30,7 +30,7 @@
   when: needs_charm_build and
           (charm_archived.rc is defined and charm_archived.rc == 0)
   zuul_swift_upload:
-    cloud: "{{ serverstack_cloud }}"
+    cloud: "{{ ps6_cloud }}"
     partition: "false"
     container: "zuul-built-charms"
     public: "yes"
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 53d78a5..beff8c5 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -205,7 +205,7 @@
     provides: charm
     run: playbooks/charm/build.yaml
     secrets:
-      - serverstack_cloud
+      - ps6_cloud
     nodeset:
       nodes:
         - name: jammy-medium
@@ -219,7 +219,7 @@
     post-run: playbooks/juju/post.yaml
     cleanup-run: playbooks/juju/cleanup.yaml
     secrets:
-      - serverstack_cloud
+      - ps6_cloud
 
 - job:
     name: func-target
@@ -315,11 +315,11 @@
         OS_VIP19: "{{ network }}.249"
         OS_VIP20: "{{ network }}.250"
         VIP_RANGE: "{{ network }}.230:{{ network }}.250"
-        OS_AUTH_URL: "{{ serverstack_cloud.auth.auth_url }}"
-        OS_USERNAME: "{{ serverstack_cloud.auth.username }}"
-        OS_PASSWORD: "{{ serverstack_cloud.auth.password }}"
-        OS_USER_DOMAIN_NAME: "{{ serverstack_cloud.auth.user_domain_name }}"
-        OS_PROJECT_NAME: "{{ serverstack_cloud.auth.project_name }}"
+        OS_AUTH_URL: "{{ ps6_cloud.auth.auth_url }}"
+        OS_USERNAME: "{{ ps6_cloud.auth.username }}"
+        OS_PASSWORD: "{{ ps6_cloud.auth.password }}"
+        OS_USER_DOMAIN_NAME: "{{ ps6_cloud.auth.user_domain_name }}"
+        OS_PROJECT_NAME: "{{ ps6_cloud.auth.project_name }}"
         OS_PROJECT_DOMAIN_NAME: user
         OS_AUTH_VERSION: 3
         OS_IDENTITY_API_VERSION: 3
@@ -357,7 +357,7 @@
         TEST_REGISTRY_PREFIX: "10.245.164.190:5000"
       tox_envlist: func-target
     secrets:
-      - serverstack_cloud
+      - ps6_cloud
       - purestorage_api_token
       - netapp_vsadmin_password
 
@@ -816,7 +816,7 @@
     post-review: true
     run: playbooks/charm/publish.yaml
     secrets:
-      - serverstack_cloud
+      - ps6_cloud
       - charmhub_token
     nodeset:
       nodes: