diff --git a/Workbench/comanage/Dockerfile b/Workbench/comanage/Dockerfile
index 9264566..7c82014 100644
--- a/Workbench/comanage/Dockerfile
+++ b/Workbench/comanage/Dockerfile
@@ -27,7 +27,7 @@ RUN yum -y update && yum -y install --setopt=tsflags=nodocs epel-release python-
 ARG maintainer=my
 ARG imagename=comanage
 ARG version=3.3.1
-ARG CSPHOSTNAME
+ARG CSPHOSTNAME=localhost
 ENV CSPHOSTNAME=$CSPHOSTNAME
 ENV COMANAGE_REGISTRY_VIRTUAL_HOST_FQDN=$CSPHOSTNAME
 
diff --git a/Workbench/docker-compose.yml b/Workbench/docker-compose.yml
index 86d464a..ff80dcd 100644
--- a/Workbench/docker-compose.yml
+++ b/Workbench/docker-compose.yml
@@ -290,7 +290,13 @@ services:
      - 443:443
 
   comanage:
-    build: ./comanage/
+    build: 
+      context: ./comanage/
+      args:
+        - CSPHOSTNAME
+    environment:
+     - ENV
+     - USERTOKEN
     networks:
      - net
     ports: