diff --git a/Makefile b/Makefile
index 448961b..ef85894 100644
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,7 @@
 -include secrets.mk
 include config.mk
 -include $(DEPLOY_CONFIG_OVERRIDE)
-include make-deploy/copy.mk
-include make-deploy/docker.mk
-include make-deploy/k8s.mk
-include make-deploy/cron.mk
-include make-deploy/kustomize.mk
-include make-deploy/helm.mk
+include make-deploy/$(DEPLOY_TYPE).mk
 
 .PHONY: self-update mandatory prerequisites prepare build test deploy pre-deploy post-deploy pre-local post-local upload pull start stop restart reload
 
diff --git a/docker.mk b/compose.mk
similarity index 64%
rename from docker.mk
rename to compose.mk
index 9dc7330..e39b95f 100644
--- a/docker.mk
+++ b/compose.mk
@@ -1,5 +1,4 @@
 MANDATORY-compose = DEPLOY_HOSTS DEPLOY_TYPE TAG
-MANDATORY-swarm = DEPLOY_HOSTS DEPLOY_TYPE TAG
 
 pull-compose:
 	@- echo "\n### pulling image(s)"
@@ -12,8 +11,6 @@ pull-compose:
 		ssh $(SSH_USER)@$(host) "docker pull $(DOCKER_IMAGE)"; \
 	)
 
-pull-swarm:
-
 start-compose:
 	@- echo "\n### starting service(s)"
 	@- $(foreach host,$(DEPLOY_HOSTS), \
@@ -21,13 +18,6 @@ start-compose:
 		ssh $(SSH_USER)@$(host) "cd $(DEPLOY_PATH)/$(DEPLOY_NAME); docker-compose up -d"; \
 	)
 
-start-swarm:
-	@- echo "\n### starting service(s)"
-	@- $(foreach host,$(DEPLOY_HOSTS), \
-		echo "$(host)"; \
-		ssh $(SSH_USER)@$(host) "cd $(DEPLOY_PATH)/$(DEPLOY_NAME); docker stack deploy -c stack.yml $(DEPLOY_NAME)"; \
-	)
-
 stop-compose:
 	@- echo "\n### stopping service(s)"
 	@- $(foreach host,$(DEPLOY_HOSTS), \
@@ -35,26 +25,12 @@ stop-compose:
 		ssh $(SSH_USER)@$(host) "cd $(DEPLOY_PATH)/$(DEPLOY_NAME); docker-compose down"; \
 	)
 		
-stop-swarm:
-	@- echo "\n### stopping service(s)"
-	@- $(foreach host,$(DEPLOY_HOSTS), \
-		echo "$(host)"; \
-		ssh $(SSH_USER)@$(host) "docker stack rm $(DEPLOY_NAME)"; \
-	)
-	
 logs-compose:
 	@- echo "\n### logs"
 	@- ssh $(SSH_USER)@$(host) "cd $(DEPLOY_PATH)/$(DEPLOY_NAME); docker-compose logs -f $(service)"
 	
-logs-swarm:
-	@- echo "\n### logs"
-	@- ssh $(SSH_USER)@$(host) "docker service logs -f $(service)"
-	
 restart-compose:
 	@- $(foreach host,$(DEPLOY_HOSTS), \
 		echo "$(host)"; \
 		ssh $(SSH_USER)@$(host) "cd $(DEPLOY_PATH)/$(DEPLOY_NAME); docker-compose restart"; \
 	)
-
-restart-swarm:
-	# nop
diff --git a/swarm.mk b/swarm.mk
new file mode 100644
index 0000000..913a125
--- /dev/null
+++ b/swarm.mk
@@ -0,0 +1,24 @@
+MANDATORY-swarm = DEPLOY_HOSTS DEPLOY_TYPE TAG
+
+pull-swarm:
+
+start-swarm:
+	@- echo "\n### starting service(s)"
+	@- $(foreach host,$(DEPLOY_HOSTS), \
+		echo "$(host)"; \
+		ssh $(SSH_USER)@$(host) "cd $(DEPLOY_PATH)/$(DEPLOY_NAME); docker stack deploy -c stack.yml $(DEPLOY_NAME)"; \
+	)
+
+stop-swarm:
+	@- echo "\n### stopping service(s)"
+	@- $(foreach host,$(DEPLOY_HOSTS), \
+		echo "$(host)"; \
+		ssh $(SSH_USER)@$(host) "docker stack rm $(DEPLOY_NAME)"; \
+	)
+	
+logs-swarm:
+	@- echo "\n### logs"
+	@- ssh $(SSH_USER)@$(host) "docker service logs -f $(service)"
+	
+restart-swarm:
+	# nop