diff --git a/.travis.yml b/.travis.yml
index f3318fb..c886003 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,13 +6,11 @@ services:
 jobs:
   include:
   - stage: build
-    name: go-build
     script: make container-run/all
 
 deploy:
   - provider: script
     script: make container-run/release/all
-    # skip_cleanup: true
     on:
       tags: true
 
diff --git a/Makefile b/Makefile
index ffcb213..d0f5ecd 100644
--- a/Makefile
+++ b/Makefile
@@ -230,59 +230,59 @@ container-image/push/amd64: container-image/build/amd64
 # current os
 PHONY+=container-run/${EXECUTABLE}
 container-run/${EXECUTABLE}:
-	$(MAKE) container-run/ COMMAND=$(subst container-run/,,$@)
+	$(MAKE) container-run COMMAND=$(subst container-run/,,$@)
 
 # build all binaries for any operating system
 PHONY+=container-run/all
 container-run/all:
-	$(MAKE) container-run/ COMMAND=$(subst container-run/,,$@)
+	$(MAKE) container-run COMMAND=$(subst container-run/,,$@)
 
 PHONY+=${UNIX_EXECUTABLE_TARGETS:%=container-run/%}
 ${UNIX_EXECUTABLE_TARGETS:%=container-run/%}:
-	$(MAKE) container-run/ COMMAND=$(subst container-run/,,$@)
+	$(MAKE) container-run COMMAND=$(subst container-run/,,$@)
 
 # CONTAINER STEPS - GO-BINDATA
 # ==============================================================================
 PHONY+=container-run/bindata
 container-run/bindata:
-	$(MAKE) container-run/ COMMAND=$(subst container-run/,,$@)
+	$(MAKE) container-run COMMAND=$(subst container-run/,,$@)
 
 # CONTAINER STEPS - TEST
 # ==============================================================================
 PHONY+=container-run/test
 container-run/test:
-	$(MAKE) container-run/ COMMAND=$(subst container-run/,,$@)
+	$(MAKE) container-run COMMAND=$(subst container-run/,,$@)
 
 PHONY+=container-run/test-update-all
 container-run/test-update-all:
-	$(MAKE) container-run/ COMMAND=$(subst container-run/,,$@)
+	$(MAKE) container-run COMMAND=$(subst container-run/,,$@)
 
 # CONTAINER STEPS - COMPRESSED BINARIES AND PACKAGES
 # ==============================================================================
 PHONY+=${COMPRESSED_EXECUTABLE_TARGETS:%=container-run/%}
 ${COMPRESSED_EXECUTABLE_TARGETS:%=container-run/%}:
-	$(MAKE) container-run/ COMMAND=$(subst container-run/,,$@)
+	$(MAKE) container-run COMMAND=$(subst container-run/,,$@)
 
 PHONY+=${RPM_EXECUTABLE_TARGETS:%=container-run/%}
 ${RPM_EXECUTABLE_TARGETS:%=container-run/%}:
-	$(MAKE) container-run/ COMMAND=$(subst container-run/,,$@)
+	$(MAKE) container-run COMMAND=$(subst container-run/,,$@)
 
 # CONTAINER STEPS - RELEASE COMPRESSED BINARIES AND PACKAGES
 # ==============================================================================
 PHONY+=${RELEASE_EXECUTABLE_TARGETS%=container-run/%}
 ${RELEASE_EXECUTABLE_TARGETS:%=container-run/%}:
-	$(MAKE) container-run/ COMMAND=$(subst container-run/,,$@)
+	$(MAKE) container-run COMMAND=$(subst container-run/,,$@)
 
 # CONTAINER STEPS - OTHER STUF
 # ==============================================================================
 PHONY+=container-run/clean
 container-run/clean:
-	$(MAKE) container-run/ COMMAND=$(subst container-run/,,$@)
+	$(MAKE) container-run COMMAND=$(subst container-run/,,$@)
 
 # GENERAL CONTAINER COMMAND
 # ==============================================================================
-PHONY+=container-run/
-container-run/:
+PHONY+=container-run
+container-run:
 	${CONTAINER_RUNTIME} run \
 		--rm \
 		--volume ${PWD}:/workspace \