diff --git a/docker/services/ceilometer-agent-notification.yaml b/docker/services/ceilometer-agent-notification.yaml
index 28b3afcca4..b2e4cd3969 100644
--- a/docker/services/ceilometer-agent-notification.yaml
+++ b/docker/services/ceilometer-agent-notification.yaml
@@ -40,6 +40,10 @@ parameters:
     default: false
     description: Remove package if the service is being disabled during upgrade
     type: boolean
+  CeilometerEnablePanko:
+    default: true
+    description: Check if panko need to be enabled or not.
+    type: boolean
 
 resources:
 
@@ -56,6 +60,9 @@ resources:
       RoleName: {get_param: RoleName}
       RoleParameters: {get_param: RoleParameters}
 
+conditions:
+  ceilometer_enable_panko: {equals: [{get_param: CeilometerEnablePanko}, True]}
+
 outputs:
   role_data:
     description: Role data for the Ceilometer Agent Notification role.
@@ -80,10 +87,13 @@ outputs:
               dest: "/"
               merge: true
               preserve_properties: true
-            - source: "/var/lib/kolla/config_files/src-panko/*"
-              dest: "/"
-              merge: true
-              preserve_properties: true
+            - if:
+                - ceilometer_enable_panko
+                - source: "/var/lib/kolla/config_files/src-panko/*"
+                  dest: "/"
+                  merge: true
+                  preserve_properties: true
+                - ''
           permissions:
             - path: /etc/panko
               owner: root:ceilometer
diff --git a/environments/disable-panko.yaml b/environments/disable-panko.yaml
new file mode 100644
index 0000000000..c0ae0be302
--- /dev/null
+++ b/environments/disable-panko.yaml
@@ -0,0 +1,11 @@
+# This heat environment can be used to disable panko services.
+# Panko should not be used in most deployement, but we can't yet remove it from
+# the default setup.
+
+resource_registry:
+  OS::TripleO::Services::PankoApi: OS::Heat::None
+
+parameter_defaults:
+  CeilometerEnablePanko: false
+  EventPipelinePublishers:
+    - gnocchi://?archive_policy=high