diff --git a/Makefile b/Makefile
index adfbb123d..007ae65d6 100644
--- a/Makefile
+++ b/Makefile
@@ -43,8 +43,10 @@ export UNIWORXDB_OPTS ?= -cf
 export PROD ?= false
 export SRC
 
-ifneq ($(PROD),true)
-  export --DEVELOPMENT=--flag uniworx:dev
+ifeq ($(PROD),true)
+export --DEVELOPMENT=--flag uniworx:-dev
+else
+export --DEVELOPMENT=--flag uniworx:dev
 endif
 
 export DATE := $(shell date +'%Y-%m-%dT%H-%M-%S')
@@ -158,14 +160,14 @@ start:
 .PHONY: %-memcached
 %-memcached: SERVICE=memcached
 %-memcached: SERVICE_VARIANT=memcached
-%-memcached: IMAGE=$$(MEMCACHED_IMAGE) --port=`cat $$(CONTAINER_FILE) | grep 'MEMCACHED_PORT=' | sed 's/MEMCACHED_PORT=//'`
+%-memcached: IMAGE=$$(MEMCACHED_IMAGE) --port=11211
 %-memcached: LOCAL_CONTAINERFILE=false
 %-memcached: BASE_PORTS = "MEMCACHED_PORT=11211"
 
 .PHONY: %-maildev
 %-maildev: SERVICE=maildev
 %-maildev: SERVICE_VARIANT=maildev
-%-maildev: IMAGE=$$(MAILDEV_IMAGE) --port=`cat $$(CONTAINER_FILE) | grep 'MAILDEV_PORT=' | sed 's/MAILDEV_PORT=//'`
+%-maildev: IMAGE=$$(MAILDEV_IMAGE) --port=1025
 %-maildev: LOCAL_CONTAINERFILE=false
 %-maildev: BASE_PORTS = "MAILDEV_PORT=1025"
 
@@ -179,7 +181,7 @@ start:
 .PHONY: %-minio
 %-minio: SERVICE=minio
 %-minio: SERVICE_VARIANT=minio
-%-minio: IMAGE=$$(MINIO_IMAGE) -- server `mktemp` --address=:`cat $$(CONTAINER_FILE) | grep 'UPLOAD_S3_PORT=' | sed 's/UPLOAD_S3_PORT=//'`
+%-minio: IMAGE=$$(MINIO_IMAGE) -- server /tmp/minio
 %-minio: LOCAL_CONTAINERFILE=false
 %-minio: BASE_PORTS = "UPLOAD_S3_PORT=9000"