diff --git a/ci/environments/scenario002-standalone.yaml b/ci/environments/scenario002-standalone.yaml
index 2c21178afa..4b8356aa3c 100644
--- a/ci/environments/scenario002-standalone.yaml
+++ b/ci/environments/scenario002-standalone.yaml
@@ -14,7 +14,7 @@ resource_registry:
   OS::TripleO::Services::HeatApiCloudwatch: ../../deployment/heat/heat-api-cloudwatch-disabled-puppet.yaml
   OS::TripleO::Services::HeatEngine: ../../deployment/heat/heat-engine-container-puppet.yaml
   OS::TripleO::Services::BarbicanApi: ../../deployment/barbican/barbican-api-container-puppet.yaml
-  OS::TripleO::Services::Zaqar: ../../deployment/zaqar/zaqar-container-puppet.yaml
+  OS::TripleO::Services::Zaqar: ../../deployment/deprecated/zaqar/zaqar-container-puppet.yaml
   OS::TripleO::Services::OsloMessagingRpc: ../../deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml
   OS::TripleO::Services::OsloMessagingNotify: ../../deployment/rabbitmq/rabbitmq-messaging-notify-shared-puppet.yaml
   OS::TripleO::Services::Redis: ../../deployment/database/redis-pacemaker-puppet.yaml
diff --git a/deployment/zaqar/zaqar-container-puppet.yaml b/deployment/deprecated/zaqar/zaqar-container-puppet.yaml
similarity index 99%
rename from deployment/zaqar/zaqar-container-puppet.yaml
rename to deployment/deprecated/zaqar/zaqar-container-puppet.yaml
index fe64f1d656..ab832990c7 100644
--- a/deployment/zaqar/zaqar-container-puppet.yaml
+++ b/deployment/deprecated/zaqar/zaqar-container-puppet.yaml
@@ -103,7 +103,7 @@ conditions:
 resources:
 
   ApacheServiceBase:
-    type: ../../deployment/apache/apache-baremetal-puppet.yaml
+    type: ../../../deployment/apache/apache-baremetal-puppet.yaml
     properties:
       ServiceData: {get_param: ServiceData}
       ServiceNetMap: {get_param: ServiceNetMap}
@@ -112,10 +112,10 @@ resources:
       EnableInternalTLS: {get_param: EnableInternalTLS}
 
   ContainersCommon:
-    type: ../containers-common.yaml
+    type: ../../containers-common.yaml
 
   MySQLClient:
-    type: ../database/mysql-client.yaml
+    type: ../../database/mysql-client.yaml
 
 outputs:
   role_data:
diff --git a/environments/services/zaqar-swift-backend.yaml b/environments/services/zaqar-swift-backend.yaml
index b4f40b7f45..fdc36a9fe3 100644
--- a/environments/services/zaqar-swift-backend.yaml
+++ b/environments/services/zaqar-swift-backend.yaml
@@ -1,4 +1,4 @@
 # Env file to enable zaqar without makins use of Redis as a backend
 resource_registry:
-  OS::TripleO::Services::Zaqar: ../../deployment/zaqar/zaqar-container-puppet.yaml
+  OS::TripleO::Services::Zaqar: ../../deployment/deprecated/zaqar/zaqar-container-puppet.yaml
   OS::TripleO::Services::Redis: OS::Heat::None
diff --git a/environments/services/zaqar.yaml b/environments/services/zaqar.yaml
index a093798510..963babaa34 100644
--- a/environments/services/zaqar.yaml
+++ b/environments/services/zaqar.yaml
@@ -1,3 +1,3 @@
 resource_registry:
-  OS::TripleO::Services::Zaqar: ../../deployment/zaqar/zaqar-container-puppet.yaml
+  OS::TripleO::Services::Zaqar: ../../deployment/deprecated/zaqar/zaqar-container-puppet.yaml
   OS::TripleO::Services::Redis : ../../deployment/database/redis-container-puppet.yaml
diff --git a/environments/undercloud.yaml b/environments/undercloud.yaml
index 25260f6339..4a897d61c2 100644
--- a/environments/undercloud.yaml
+++ b/environments/undercloud.yaml
@@ -134,8 +134,6 @@ parameter_defaults:
   #   - ip_range: '192.168.24.100,192.168.24.200'
   IronicProvisioningNetwork: 'ctlplane'
   IronicRescuingNetwork: 'ctlplane'
-  ZaqarMessageStore: 'swift'
-  ZaqarManagementStore: 'sqlalchemy'
   MistralCorsAllowedOrigin: '*'
   MistralExecutionFieldSizeLimit: 16384
   NeutronServicePlugins: router,segments
diff --git a/releasenotes/notes/deprecate-zaqar-622f409474813783.yaml b/releasenotes/notes/deprecate-zaqar-622f409474813783.yaml
new file mode 100644
index 0000000000..d70483b380
--- /dev/null
+++ b/releasenotes/notes/deprecate-zaqar-622f409474813783.yaml
@@ -0,0 +1,4 @@
+---
+deprecations:
+  - |
+    Zaqar services are deprecated for removal.