diff --git a/hot/software-config/heat-container-agent/Dockerfile b/hot/software-config/heat-container-agent/Dockerfile
index ddd26b86..fe4c2a5f 100644
--- a/hot/software-config/heat-container-agent/Dockerfile
+++ b/hot/software-config/heat-container-agent/Dockerfile
@@ -1,6 +1,4 @@
-#Using Fedora 21, latest/22 has number of changes that
-#breaks th build
-FROM fedora:21
+FROM fedora
 MAINTAINER “Rabi Mishra” <ramishra@redhat.com>
 ENV container docker
 
diff --git a/hot/software-config/heat-container-agent/scripts/configure_container_agent.sh b/hot/software-config/heat-container-agent/scripts/configure_container_agent.sh
index 9f24e0e6..aac84c23 100644
--- a/hot/software-config/heat-container-agent/scripts/configure_container_agent.sh
+++ b/hot/software-config/heat-container-agent/scripts/configure_container_agent.sh
@@ -1,22 +1,19 @@
 #!/bin/bash
 set -eux
 
-yum -y update
+dnf -y update
 
-yum -y install os-collect-config os-apply-config \
-  os-refresh-config dib-utils python-pip \
-  python-docker-py python-yaml
+dnf -y install findutils os-collect-config os-apply-config \
+  os-refresh-config dib-utils python-pip python-docker-py \
+  python-yaml
 
-yum clean all
+dnf clean all
 
 # pip installing dpath as python-dpath is an older version of dpath
 pip install dpath
 
-# using binary as 'docker-compose' and 'os-collect-config' has conflict on 'requests' version
-# docker-compose pins requests version to 2.6.1
-curl -L https://github.com/docker/compose/releases/download/1.4.0/docker-compose-`uname -s`-`uname -m` \
-    > /usr/local/bin/docker-compose
-chmod +x /usr/local/bin/docker-compose
+# install docker-compose
+pip install docker-compose
 
 # os-apply-config templates directory
 oac_templates=/usr/libexec/os-apply-config/templates