diff --git a/elements/dpkg/cleanup.d/40-unblock-daemons b/elements/dpkg/cleanup.d/40-unblock-daemons
index b30f4619..7d50f1f4 100755
--- a/elements/dpkg/cleanup.d/40-unblock-daemons
+++ b/elements/dpkg/cleanup.d/40-unblock-daemons
@@ -5,8 +5,10 @@ set -e
 [ -n "$TARGET_ROOT" ]
 
 sudo mv $TARGET_ROOT/sbin/start-stop-daemon.REAL $TARGET_ROOT/sbin/start-stop-daemon
+
 if [ -f $TARGET_ROOT/sbin/initctl.REAL ]
 then
     sudo mv $TARGET_ROOT/sbin/initctl.REAL $TARGET_ROOT/sbin/initctl
 fi
-sudo mv $TARGET_ROOT/usr/sbin/invoke-rc.d.REAL $TARGET_ROOT/usr/sbin/invoke-rc.d
+
+sudo rm $TARGET_ROOT/usr/sbin/policy-rc.d
diff --git a/elements/dpkg/root.d/99-block-daemons b/elements/dpkg/root.d/99-block-daemons
index 5594651c..57d9992c 100755
--- a/elements/dpkg/root.d/99-block-daemons
+++ b/elements/dpkg/root.d/99-block-daemons
@@ -24,10 +24,10 @@ EOF
     sudo chmod 755 $TARGET_ROOT/sbin/initctl
 fi
 
-sudo mv $TARGET_ROOT/usr/sbin/invoke-rc.d $TARGET_ROOT/usr/sbin/invoke-rc.d.REAL
-sudo dd of=$TARGET_ROOT/usr/sbin/invoke-rc.d <<EOF
+sudo dd of=$TARGET_ROOT/usr/sbin/policy-rc.d <<EOF
 #!/bin/sh
-echo "invoke-rc.d (tripleo 1.0)"
-echo "Warning: Fake invoke-rc.d called, doing nothing"
+# 101 Action not allowed. The requested action will not be performed because
+#     of runlevel or local policy constraints.
+exit 101
 EOF
-sudo chmod 755 $TARGET_ROOT/usr/sbin/invoke-rc.d
+sudo chmod 755 $TARGET_ROOT/usr/sbin/policy-rc.d