diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3874c975318d3829e16a9860d87dd9e4cbcb2bf4..90047317296511eac6b3ea80c2c26681c791b2cf 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -49,6 +49,7 @@ build base image:
         - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_COMMIT_MESSAGE =~ /\A(?i)-ops/'
           changes:
             - Dockerfile.base
+            - docker.properties
 
 # Push Base Image Stage
 push base image:
@@ -61,6 +62,7 @@ push base image:
         - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_COMMIT_MESSAGE =~ /\A(?i)-ops/'
           changes:
             - Dockerfile.base
+            - docker.properties
 
 # Run Schema
 run schema:
diff --git a/apps/cli/executables/datafetcher/setup.py b/apps/cli/executables/datafetcher/setup.py
index e9d1ca63ba4fd87c347b7fd44b5ad98d25728cd2..df46315ea5e8b78b1027b747508f2d8923c8bcb1 100644
--- a/apps/cli/executables/datafetcher/setup.py
+++ b/apps/cli/executables/datafetcher/setup.py
@@ -31,5 +31,5 @@ setup(
     keywords=[],
     packages=["datafetcher"],
     classifiers=["Programming Language :: Python :: 3.8"],
-    entry_points={"console_scripts": ["datafetcher = datafetcher.commands:main"]},
+    entry_points={"console_scripts": ["datafetcher = datafetcher.datafetcher:main"]},
 )
diff --git a/services/workflow/requirements.txt b/services/workflow/requirements.txt
index 669ebdc23e8e75e96e2278f7222f9daa64122840..abdd4d8bb6095f43e0cd480de980d333b02f4540 100644
--- a/services/workflow/requirements.txt
+++ b/services/workflow/requirements.txt
@@ -5,16 +5,19 @@
 -e ../packages/shared/channels
 -e ../packages/shared/workspaces
 -e ../packages/apps/cli/utilities/wf_monitor
+-e ../packages/apps/cli/executables/datafetcher
 -e ../packages/apps/cli/executables/null
 -e ../packages/apps/cli/executables/vulture
 -e ../packages/testing
 
-pycapo == 0.3.0
+psycopg2 >= 2.8.5,<3.0
+pycapo == 0.3.1
 pyramid == 1.10
 pyramid_beaker == 0.8
 pyramid_debugtoolbar == 4.5
 pyramid_retry == 2.1.1
 pyramid_tm == 2.2.1
+pytest == 5.4.3
 requests == 2.23
 sqlalchemy == 1.3.23
 waitress == 1.4