diff --git a/docker-compose.yml b/docker-compose.yml
index bc125c3de..ba071b9a8 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,14 +22,15 @@ services:
             - /etc/timezone:/etc/timezone:ro
 
     uxbackend:
-        #build: ./backend
-        image: monogramm/uxbox:backend
+        build: ./backend
+        #image: monogramm/uxbox:backend
+        #image: uxbox-backend:beta
         container_name: uxbackend
         #restart: always
         depends_on:
             - uxdb
         ports:
-            - "6060:6060"
+            - 6060:6060
         environment:
             # HTTP setup
             - UXBOX_HTTP_SERVER_DEBUG=false
@@ -64,8 +65,9 @@ services:
             - /etc/timezone:/etc/timezone:ro
 
     uxfrontend:
-        #build: ./frontend
-        image: monogramm/uxbox:frontend
+        build: ./frontend
+        #image: monogramm/uxbox:frontend
+        #image: uxbox-frontend:beta
         container_name: uxfrontend
         #hostname: uxbox.io
         #restart: always
diff --git a/manage.sh b/manage.sh
index e7580f9b7..5c5459b67 100755
--- a/manage.sh
+++ b/manage.sh
@@ -37,7 +37,6 @@ function run_image {
     rm -rf ./frontend/node_modules
 
     CONTAINER=$IMGNAME:$REV
-    #CONTAINER=monogramm/uxbox:develop
 
     echo "Running development image $CONTAINER..."
     sudo docker run -ti \