diff --git a/files/fedora-cloud/packstack-controller-answers.txt b/files/fedora-cloud/packstack-controller-answers.txt
index 886243198d..6a94910096 100644
--- a/files/fedora-cloud/packstack-controller-answers.txt
+++ b/files/fedora-cloud/packstack-controller-answers.txt
@@ -83,7 +83,7 @@ CONFIG_AMQP_BACKEND=rabbitmq
 CONFIG_AMQP_HOST={{ controller_public_ip }}
 
 # Enable SSL for the AMQP service
-CONFIG_AMQP_ENABLE_SSL=y
+CONFIG_AMQP_ENABLE_SSL=n
 
 # Enable Authentication for the AMQP service
 CONFIG_AMQP_ENABLE_AUTH=y
diff --git a/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml b/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml
index a26b9f8fa3..d845eb05c4 100644
--- a/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml
+++ b/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml
@@ -144,31 +144,31 @@
       regexp="RABBITMQ_NODE_PORT"
       line="    'RABBITMQ_NODE_PORTTTTT'        => $port,"
       backup=yes
-  - lineinfile:
-      dest=/usr/share/openstack-puppet/modules/rabbitmq/templates/rabbitmq.config.erb
-      regexp="cacertfile"
-      line="    {ssl_options, [{cacertfile,\"<%= @ssl_cert %>\"},"
-      backup=yes
-  - lineinfile:
-      dest=/usr/share/openstack-puppet/modules/neutron/manifests/init.pp
-      regexp="rabbit_use_ssl              = "
-      line="  $rabbit_use_ssl              = true,"
-      backup=yes
-  - lineinfile:
-      dest=/usr/share/openstack-puppet/modules/nova/manifests/init.pp
-      regexp="rabbit_use_ssl           = "
-      line="  $rabbit_use_ssl           = true,"
-      backup=yes
-  - lineinfile:
-      dest=/usr/share/openstack-puppet/modules/glance/manifests/notify/rabbitmq.pp
-      regexp="rabbit_use_ssl               = "
-      line="  $rabbit_use_ssl               = true,"
-      backup=yes
-  - lineinfile:
-      dest=/usr/share/openstack-puppet/modules/ceilometer/manifests/init.pp
-      regexp="rabbit_use_ssl      = "
-      line="  $rabbit_use_ssl      = true,"
-      backup=yes
+  #- lineinfile:
+  #    dest=/usr/share/openstack-puppet/modules/rabbitmq/templates/rabbitmq.config.erb
+  #    regexp="cacertfile"
+  #    line="    {ssl_options, [{cacertfile,\"<%= @ssl_cert %>\"},"
+  #    backup=yes
+  #- lineinfile:
+  #    dest=/usr/share/openstack-puppet/modules/neutron/manifests/init.pp
+  #    regexp="rabbit_use_ssl              = "
+  #    line="  $rabbit_use_ssl              = true,"
+  #    backup=yes
+  #- lineinfile:
+  #    dest=/usr/share/openstack-puppet/modules/nova/manifests/init.pp
+  #    regexp="rabbit_use_ssl           = "
+  #    line="  $rabbit_use_ssl           = true,"
+  #    backup=yes
+  #- lineinfile:
+  #    dest=/usr/share/openstack-puppet/modules/glance/manifests/notify/rabbitmq.pp
+  #    regexp="rabbit_use_ssl               = "
+  #    line="  $rabbit_use_ssl               = true,"
+  #    backup=yes
+  #- lineinfile:
+  #    dest=/usr/share/openstack-puppet/modules/ceilometer/manifests/init.pp
+  #    regexp="rabbit_use_ssl      = "
+  #    line="  $rabbit_use_ssl      = true,"
+  #    backup=yes
   - lineinfile:
       dest=/usr/lib/python2.7/site-packages/packstack/puppet/templates/mongodb.pp
       regexp="pidfilepath"
@@ -190,31 +190,31 @@
   - service: name=rabbitmq-server state=started
 
   # WORKAROUND again
-  - ini_file: dest=/etc/keystone/keystone.conf section="DEFAULT" option="rabbit_use_ssl" value="true"
-  - service: name=rabbitmq-server state=restarted
-  - ini_file: dest=/etc/nova/nova.conf section="DEFAULT" option="rabbit_use_ssl" value="true"
-  - ini_file: dest=/etc/cinder/cinder.conf section="DEFAULT" option="rabbit_use_ssl" value="true"
-  - ini_file: dest=/etc/ceilometer/ceilometer.conf section="DEFAULT" option="rabbit_use_ssl" value="true"
-  - service: name="{{item}}" state=restarted
-    with_items:
-    - openstack-ceilometer-alarm-evaluator
-    - openstack-ceilometer-alarm-notifier
-    - openstack-ceilometer-api
-    - openstack-ceilometer-central
-    - openstack-ceilometer-collector
-    - openstack-ceilometer-compute
-    - openstack-ceilometer-notification
-    - openstack-cinder-api
-    - openstack-cinder-backup
-    - openstack-cinder-scheduler
-    - openstack-cinder-volume
-    - openstack-nova-api
-    - openstack-nova-cert
-    - openstack-nova-compute
-    - openstack-nova-conductor
-    - openstack-nova-consoleauth
-    - openstack-nova-novncproxy
-    - openstack-nova-scheduler
+  #- ini_file: dest=/etc/keystone/keystone.conf section="DEFAULT" option="rabbit_use_ssl" value="true"
+  #- service: name=rabbitmq-server state=restarted
+  #- ini_file: dest=/etc/nova/nova.conf section="DEFAULT" option="rabbit_use_ssl" value="true"
+  #- ini_file: dest=/etc/cinder/cinder.conf section="DEFAULT" option="rabbit_use_ssl" value="true"
+  #- ini_file: dest=/etc/ceilometer/ceilometer.conf section="DEFAULT" option="rabbit_use_ssl" value="true"
+  #- service: name="{{item}}" state=restarted
+  #  with_items:
+  #  - openstack-ceilometer-alarm-evaluator
+  #  - openstack-ceilometer-alarm-notifier
+  #  - openstack-ceilometer-api
+  #  - openstack-ceilometer-central
+  #  - openstack-ceilometer-collector
+  #  - openstack-ceilometer-compute
+  #  - openstack-ceilometer-notification
+  #  - openstack-cinder-api
+  #  - openstack-cinder-backup
+  #  - openstack-cinder-scheduler
+  #  - openstack-cinder-volume
+  #  - openstack-nova-api
+  #  - openstack-nova-cert
+  #  - openstack-nova-compute
+  #  - openstack-nova-conductor
+  #  - openstack-nova-consoleauth
+  #  - openstack-nova-novncproxy
+  #  - openstack-nova-scheduler
 
   # configure cider with multi back-end
   # https://access.redhat.com/documentation/en-US/Red_Hat_Enterprise_Linux_OpenStack_Platform/5/html/Cloud_Administrator_Guide/section_manage-volumes.html