diff --git a/base-kustomize/ceilometer/base/ceilometer-swift-rabbitmq-queue.yaml b/base-kustomize/ceilometer/base/ceilometer-swift-rabbitmq-queue.yaml
new file mode 100644
index 00000000..4970d602
--- /dev/null
+++ b/base-kustomize/ceilometer/base/ceilometer-swift-rabbitmq-queue.yaml
@@ -0,0 +1,83 @@
+---
+apiVersion: rabbitmq.com/v1beta1
+kind: User
+metadata:
+  name: ceilometer-swift
+  namespace: openstack
+  labels:
+    app.kubernetes.io/managed-by: "Helm"
+  annotations:
+    helm.sh/resource-policy: keep
+    meta.helm.sh/release-name: "ceilometer"
+    meta.helm.sh/release-namespace: "openstack"
+spec:
+  tags:
+    - management  # available tags are 'management', 'policymaker', 'monitoring' and 'administrator'
+    - policymaker
+  rabbitmqClusterReference:
+    name: rabbitmq  # rabbitmqCluster must exist in the same namespace as this resource
+    namespace: openstack
+  importCredentialsSecret:
+    name: ceilometer-swift-rabbitmq-password
+---
+apiVersion: rabbitmq.com/v1beta1
+kind: Vhost
+metadata:
+  name: ceilometer-swift-vhost
+  namespace: openstack
+  labels:
+    app.kubernetes.io/managed-by: "Helm"
+  annotations:
+    helm.sh/resource-policy: keep
+    meta.helm.sh/release-name: "ceilometer"
+    meta.helm.sh/release-namespace: "openstack"
+spec:
+  name: "ceilometer-swift"  # vhost name; required and cannot be updated
+  defaultQueueType: quorum  # default queue type for this vhost; require RabbitMQ version 3.11.12 or above
+  rabbitmqClusterReference:
+    name: rabbitmq  # rabbitmqCluster must exist in the same namespace as this resource
+    namespace: openstack
+---
+apiVersion: rabbitmq.com/v1beta1
+kind: Queue
+metadata:
+  name: ceilometer-swift-queue
+  namespace: openstack
+  labels:
+    app.kubernetes.io/managed-by: "Helm"
+  annotations:
+    helm.sh/resource-policy: keep
+    meta.helm.sh/release-name: "ceilometer"
+    meta.helm.sh/release-namespace: "openstack"
+spec:
+  name: ceilometer-swift-qq  # name of the queue
+  vhost: "ceilometer-swift"  # default to '/' if not provided
+  type: quorum  # without providing a queue type, rabbitmq creates a classic queue
+  autoDelete: false
+  durable: true  # setting 'durable' to false means this queue won't survive a server restart
+  rabbitmqClusterReference:
+    name: rabbitmq  # rabbitmqCluster must exist in the same namespace as this resource
+    namespace: openstack
+---
+apiVersion: rabbitmq.com/v1beta1
+kind: Permission
+metadata:
+  name: ceilometer-swift-permission
+  namespace: openstack
+  labels:
+    app.kubernetes.io/managed-by: "Helm"
+  annotations:
+    helm.sh/resource-policy: keep
+    meta.helm.sh/release-name: "ceilometer"
+    meta.helm.sh/release-namespace: "openstack"
+spec:
+  vhost: "ceilometer-swift"  # name of a vhost
+  userReference:
+    name: "ceilometer-swift"  # name of a user.rabbitmq.com in the same namespace; must specify either spec.userReference or spec.user
+  permissions:
+    write: ".*"
+    configure: ".*"
+    read: ".*"
+  rabbitmqClusterReference:
+    name: rabbitmq  # rabbitmqCluster must exist in the same namespace as this resource
+    namespace: openstack
diff --git a/base-kustomize/ceilometer/base/kustomization.yaml b/base-kustomize/ceilometer/base/kustomization.yaml
index 4993fa20..abe6c8b5 100644
--- a/base-kustomize/ceilometer/base/kustomization.yaml
+++ b/base-kustomize/ceilometer/base/kustomization.yaml
@@ -1,7 +1,9 @@
+---
 sortOptions:
   order: fifo
 resources:
   - all.yaml
   - hpa-ceilometer-notification.yaml
   - ceilometer-rabbitmq-queue.yaml
+  - ceilometer-swift-rabbitmq-queue.yaml
   - policies.yaml
diff --git a/bin/create-secrets.sh b/bin/create-secrets.sh
index d79b90e6..bbec1a21 100755
--- a/bin/create-secrets.sh
+++ b/bin/create-secrets.sh
@@ -97,6 +97,7 @@ gnocchi_pgsql_password=$(generate_password 32)
 ceilometer_keystone_admin_password=$(generate_password 32)
 ceilometer_keystone_test_password=$(generate_password 32)
 ceilometer_rabbitmq_password=$(generate_password 32)
+ceilometer_swift_rabbitmq_password=$(generate_password 32)
 memcached_shared_secret=$(generate_password 32)
 grafana_secret=$(generate_password 32)
 grafana_root_secret=$(generate_password 32)
@@ -686,6 +687,16 @@ data:
 ---
 apiVersion: v1
 kind: Secret
+metadata:
+  name: ceilometer-swift-rabbitmq-password
+  namespace: openstack
+type: Opaque
+data:
+  username: $(echo -n "ceilometer-swift" | base64)
+  password: $(echo -n $ceilometer_swift_rabbitmq_password | base64 -w0)
+---
+apiVersion: v1
+kind: Secret
 metadata:
   name: os-memcached
   namespace: openstack