diff --git a/.drone.yml b/.drone.yml
index c464460..d7c207b 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -65,7 +65,7 @@ steps:
   - name: push images
     image: thegeeklab/drone-docker-buildx
     settings:
-      repo: iamthefij/resticscheduler
+      repo: iamthefij/restic-scheduler
       auto_tag: true
       platforms:
         - linux/amd64
diff --git a/Dockerfile b/Dockerfile
index 175d770..c0556d2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,8 +16,8 @@ RUN apk add --no-cache \
 
 ARG TARGETOS
 ARG TARGETARCH
-COPY ./dist/resticscheduler-$TARGETOS-$TARGETARCH /bin/resticscheduler
+COPY ./dist/restic-scheduler-$TARGETOS-$TARGETARCH /bin/restic-scheduler
 
 HEALTHCHECK CMD ["wget", "-O", "-", "http://localhost:8080/health"]
 
-ENTRYPOINT [ "/bin/resticscheduler" ]
+ENTRYPOINT [ "/bin/restic-scheduler" ]
diff --git a/Makefile b/Makefile
index 8af700e..a5e3a8c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-APP_NAME = resticscheduler
+APP_NAME = restic-scheduler
 VERSION ?= $(shell git describe --tags --dirty)
 GOFILES = *.go
 # Multi-arch targets are generated from this
@@ -54,7 +54,7 @@ clean:
 ## Multi-arch targets
 $(TARGETS): $(GOFILES)
 	mkdir -p ./dist
-	GOOS=$(word 2, $(subst -, ,$(@))) GOARCH=$(word 3, $(subst -, ,$(@))) CGO_ENABLED=0 \
+	GOOS=$(word 3, $(subst -, ,$(@))) GOARCH=$(word 4, $(subst -, ,$(@))) CGO_ENABLED=0 \
 		 go build -ldflags '-X "main.version=$(VERSION)"' -a -installsuffix nocgo \
 		 -o $@
 
diff --git a/itest/docker-compose.yml b/itest/docker-compose.yml
index 9e207cc..a99424d 100644
--- a/itest/docker-compose.yml
+++ b/itest/docker-compose.yml
@@ -15,7 +15,7 @@ services:
       POSTGRES_DB: main
 
   bootstrap:
-    image: resticscheduler
+    image: restic-scheduler
     entrypoint: /bootstrap-tests.sh
     environment:
       MYSQL_HOST: mysql
@@ -29,7 +29,7 @@ services:
       - ./data:/data
 
   main:
-    image: resticscheduler
+    image: restic-scheduler
     environment:
       MYSQL_HOST: mysql
       MYSQL_USER: root
@@ -43,7 +43,7 @@ services:
       - ./test-backup.hcl:/test-backup.hcl
 
   validate:
-    image: resticscheduler
+    image: restic-scheduler
     entrypoint: /validate-tests.sh
     environment:
       MYSQL_HOST: mysql