diff --git a/docker.mk b/docker.mk
index 5b9ede4..827fb1e 100644
--- a/docker.mk
+++ b/docker.mk
@@ -1,80 +1,56 @@
-# if want our old context back, we need something like that:
-#stored_ctx = `docker context ls | grep "\*" | cut -d " " -f1`	
-
-stored_ctx = 'default' # HACK
-
-create-docker-contexts:
-	@- $(foreach host,$(DEPLOY_HOSTS), \
-		echo "$(host)"; \
-		docker context create $(host) --description "$(host)" --docker "host=ssh://$(SSH_USER)@$(host)"; \
-	)
-
 pull-compose:
 	@- echo "\n### pulling image(s)"
-	@- $(foreach ctx,$(DEPLOY_HOSTS), \
+	@- $(foreach host,$(DEPLOY_HOSTS), \
 		echo "$(host)"; \
-		docker context use $(ctx); \
 		if test $(DOCKER_LOGIN) -eq 1 ; \
 		then \
-			docker login -u $(DOCKER_USER) -p $(DOCKER_PASS) $(DOCKER_REGISTRY); \
+			ssh $(SSH_USER)@$(host) "docker login -u $(DOCKER_USER) -p $(DOCKER_PASS) $(DOCKER_REGISTRY)"; \
 		fi; \
-		docker pull $(DOCKER_IMAGE); \
+		ssh $(SSH_USER)@$(host) "docker pull $(DOCKER_IMAGE)"; \
 	)
 
 pull-swarm:
 
 start-compose:
 	@- echo "\n### starting service(s)"
-	@- $(foreach ctx,$(DEPLOY_HOSTS), \
+	@- $(foreach host,$(DEPLOY_HOSTS), \
 		echo "$(host)"; \
-		docker context use $(ctx); \
-		docker-compose up -d; \
+		ssh $(SSH_USER)@$(host) "cd $(DEPLOY_PATH)/$(DEPLOY_NAME); docker-compose up -d"; \
 	)
-	@- docker context use $(stored_ctx)
 
 start-swarm:
 	@- echo "\n### starting service(s)"
-	@- $(foreach ctx,$(DEPLOY_HOSTS), \
+	@- $(foreach host,$(DEPLOY_HOSTS), \
 		echo "$(host)"; \
-		docker --context $(ctx) stack deploy -c stack.yml $(DEPLOY_NAME); \
+		ssh $(SSH_USER)@$(host) "cd $(DEPLOY_PATH)/$(DEPLOY_NAME); docker stack deploy -c stack.yml $(DEPLOY_NAME)"; \
 	)
-	@- docker context use $(stored_ctx)
 
 stop-compose:
 	@- echo "\n### stopping service(s)"
-	@- $(foreach ctx,$(DEPLOY_HOSTS), \
+	@- $(foreach host,$(DEPLOY_HOSTS), \
 		echo "$(host)"; \
-		docker context use $(ctx); \
-		docker-compose down; \
+		ssh $(SSH_USER)@$(host) "cd $(DEPLOY_PATH)/$(DEPLOY_NAME); docker-compose down"; \
 	)
-	@- docker context use $(stored_ctx)
 		
 stop-swarm:
 	@- echo "\n### stopping service(s)"
-	@- $(foreach ctx,$(DEPLOY_HOSTS), \
+	@- $(foreach host,$(DEPLOY_HOSTS), \
 		echo "$(host)"; \
-		docker --context $(ctx) stack rm $(DEPLOY_NAME); \
+		ssh $(SSH_USER)@$(host) "docker stack rm $(DEPLOY_NAME)"; \
 	)
-	@- docker context use $(stored_ctx)
 	
 logs-compose:
 	@- echo "\n### logs"
-	@- docker context use $(host)
-	@- docker-compose logs -f $(service)
-	@- docker context use $(stored_ctx)
+	@- ssh $(SSH_USER)@$(host) "cd $(DEPLOY_PATH)/$(DEPLOY_NAME); docker-compose logs -f $(service)"
 	
 logs-swarm:
 	@- echo "\n### logs"
-	@- docker context use $(DEPLOY_HOSTS)
-	@- docker service logs -f $(service)
-	@- docker context use $(stored_ctx)
+	@- ssh $(SSH_USER)@$(host) "docker service logs -f $(service)"
 	
 restart-compose:
-	@- $(foreach ctx,$(DEPLOY_HOSTS), \
+	@- $(foreach host,$(DEPLOY_HOSTS), \
 		echo "$(host)"; \
-		docker context use $(ctx); \
-		docker-compose restart; \
+		ssh $(SSH_USER)@$(host) "cd $(DEPLOY_PATH)/$(DEPLOY_NAME); docker-compose restart"; \
 	)
-	@- docker context use $(stored_ctx)
 	
 reload-compose: