diff --git a/bugswarm/client/docker.py b/bugswarm/client/docker.py
index 696774a..688364e 100644
--- a/bugswarm/client/docker.py
+++ b/bugswarm/client/docker.py
@@ -10,10 +10,14 @@
 HOST_SANDBOX_DEFAULT = '~/bugswarm-sandbox'
 CONTAINER_SANDBOX_DEFAULT = '/bugswarm-sandbox'
 
-DOCKER_HUB_REPO = \
-    credentials.DOCKER_HUB_REPO if hasattr(credentials, 'DOCKER_HUB_REPO') else 'bugswarm/images'
-DOCKER_HUB_CACHED_REPO = \
-    credentials.DOCKER_HUB_CACHED_REPO if hasattr(credentials, 'DOCKER_HUB_CACHED_REPO') else 'bugswarm/cached-images'
+if hasattr(credentials, 'DOCKER_HUB_REPO') and credentials.DOCKER_HUB_REPO != '#':
+    DOCKER_HUB_REPO = credentials.DOCKER_HUB_REPO
+else:
+    DOCKER_HUB_REPO = 'bugswarm/images'
+if hasattr(credentials, 'DOCKER_HUB_CACHED_REPO') and credentials.DOCKER_HUB_CACHED_REPO != '#':
+    DOCKER_HUB_CACHED_REPO = credentials.DOCKER_HUB_CACHED_REPO
+else:
+    DOCKER_HUB_CACHED_REPO = 'bugswarm/cached-images'
 
 
 # By default, this function downloads the image, enters the container, and executes '/bin/bash' in the container.
@@ -97,7 +101,7 @@ def docker_pull(image_tag):
         command = 'sudo docker pull {}'.format(image_location)
         _, _, returncode = ShellWrapper.run_commands(command, shell=True)
         if returncode != 0:
-        # Image is not in bugswarm/images
+            # Image is not in bugswarm/images
             log.error('Could not download the image', image_location)
         else:
             log.info('Downloaded the image', image_location + '.')
@@ -138,4 +142,3 @@ def _image_location(image_tag):
 
 def _default_host_sandbox():
     return os.path.expanduser(HOST_SANDBOX_DEFAULT)
-
diff --git a/setup.py b/setup.py
index c50cca9..fc46929 100644
--- a/setup.py
+++ b/setup.py
@@ -3,7 +3,7 @@
 
 setup(
     name='bugswarm-client',
-    version='0.1.7',
+    version='0.1.8',
     url='https://github.com/BugSwarm/client',
     author='BugSwarm',
     author_email='dev.bugswarm@gmail.com',
@@ -22,7 +22,7 @@
     install_requires=[
         'Click==6.7',
         'requests>=2.20.0',
-        'bugswarm-common==0.1.13',
+        'bugswarm-common==2022.12.3',
     ],
 
     entry_points={