diff --git a/elements/ironic-agent/install.d/ironic-agent-package-install/package-installs-ironic-agent b/elements/ironic-agent/install.d/ironic-agent-package-install/package-installs-ironic-agent
new file mode 100644
index 00000000..7e20b1dd
--- /dev/null
+++ b/elements/ironic-agent/install.d/ironic-agent-package-install/package-installs-ironic-agent
@@ -0,0 +1 @@
+ironic-python-agent
diff --git a/elements/ironic-agent/install.d/60-ironic-agent-install b/elements/ironic-agent/install.d/ironic-agent-source-install/60-ironic-agent-install
similarity index 100%
rename from elements/ironic-agent/install.d/60-ironic-agent-install
rename to elements/ironic-agent/install.d/ironic-agent-source-install/60-ironic-agent-install
diff --git a/elements/ironic-agent/install.d/ironic-python-agent.conf b/elements/ironic-agent/install.d/ironic-agent-source-install/ironic-python-agent.conf
similarity index 100%
rename from elements/ironic-agent/install.d/ironic-python-agent.conf
rename to elements/ironic-agent/install.d/ironic-agent-source-install/ironic-python-agent.conf
diff --git a/elements/ironic-agent/install.d/ironic-python-agent.init b/elements/ironic-agent/install.d/ironic-agent-source-install/ironic-python-agent.init
similarity index 100%
rename from elements/ironic-agent/install.d/ironic-python-agent.init
rename to elements/ironic-agent/install.d/ironic-agent-source-install/ironic-python-agent.init
diff --git a/elements/ironic-agent/install.d/ironic-python-agent.service b/elements/ironic-agent/install.d/ironic-agent-source-install/ironic-python-agent.service
similarity index 100%
rename from elements/ironic-agent/install.d/ironic-python-agent.service
rename to elements/ironic-agent/install.d/ironic-agent-source-install/ironic-python-agent.service
diff --git a/elements/ironic-agent/pkg-map b/elements/ironic-agent/pkg-map
index 636567b6..c0242ef6 100644
--- a/elements/ironic-agent/pkg-map
+++ b/elements/ironic-agent/pkg-map
@@ -2,14 +2,17 @@
   "distro": {
     "rhel": {
       "tgt": "targetcli"
+      "ironic-python-agent": "openstack-ironic-python-agent"
     },
     "centos":{
       "tgt": "scsi-target-utils"
+      "ironic-python-agent": "openstack-ironic-python-agent"
     }
   },
   "family": {
     "redhat": {
       "tgt": "scsi-target-utils"
+      "ironic-python-agent": "openstack-ironic-python-agent"
     },
     "debian": {
       "tgt": "tgt"
@@ -17,5 +20,6 @@
   },
   "default": {
     "tgt": "tgt"
+    "ironic-python-agent": "openstack-ironic-python-agent"
   }
 }
diff --git a/elements/ironic-agent/post-install.d/80-ironic-agent b/elements/ironic-agent/post-install.d/80-ironic-agent
index 440f161c..72811d8f 100755
--- a/elements/ironic-agent/post-install.d/80-ironic-agent
+++ b/elements/ironic-agent/post-install.d/80-ironic-agent
@@ -17,9 +17,11 @@ case "$DIB_INIT_SYSTEM" in
         ;;
     systemd)
         systemctl disable iptables.service
+        systemctl enable openstack-ironic-python-agent.service
         ;;
     sysv)
         update-rc.d iptables disable
+        update-rc.d openstack-ironic-python-agent enable
         ;;
     *)
         echo "Unsupported init system"