diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 103c24341d966ce504ff92058ee9fbd1220d6fcc..c74814c7599f1ec57eae157c6234625773a39573 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -240,7 +240,7 @@ test_upgrade_debian_package:
      - echo debconf shared/accepted-oracle-license-v1-1 select true | debconf-set-selections
 #hacky way of installing minerva on docker - by default rc-invoke is preventing services changes on docker
      - mv /usr/sbin/policy-rc.d /usr/sbin/policy-rc.d.backup
-     - mv Docker/policy-rc.d /usr/sbin/policy-rc.d
+     - mv gitlab-ci-policy-rc.d /usr/sbin/policy-rc.d
      - apt-get install -y --allow-unauthenticated minerva
 
 #local repository with new version
@@ -285,7 +285,7 @@ test_install_debian_package:
      - echo debconf shared/accepted-oracle-license-v1-1 select true | debconf-set-selections
 #hacky way of installing minerva on docker - by default rc-invoke is preventing services changes on docker
      - mv /usr/sbin/policy-rc.d /usr/sbin/policy-rc.d.backup
-     - mv Docker/policy-rc.d /usr/sbin/policy-rc.d
+     - mv gitlab-ci-policy-rc.d /usr/sbin/policy-rc.d
      - apt-get install -y --allow-unauthenticated minerva
      - mv /usr/sbin/policy-rc.d.backup /usr/sbin/policy-rc.d 
      - service tomcat8 start
diff --git a/gitlab-ci-policy-rc.d b/gitlab-ci-policy-rc.d
new file mode 100644
index 0000000000000000000000000000000000000000..319de32fd8336e398fe58d8eed8c3e88857cd698
--- /dev/null
+++ b/gitlab-ci-policy-rc.d
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+# For most Docker users, "apt-get install" only happens during "docker build",
+# where starting services doesn't work and often fails in humorous ways. This
+# prevents those failures by stopping the services from attempting to start.
+
+echo "policy-rc.d for " $1
+
+if [ "$1" = "tomcat7" ] || [ "$1" = "tomcat8" ];
+then
+        exit 101
+fi
+
+exit 0;
+