diff --git a/PKGBUILD b/PKGBUILD
index 02e4dc8..1fe83ff 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -22,9 +22,9 @@ package() {
 	# prepare dirs
 	install -dm755 "$pkgdir/usr/bin"
 	install -dm755 "$pkgdir/usr/lib/systemd/system"
-	install -dm755 "$pkgdir/etc/$pkgname"
+	install -dm755 "$pkgdir/etc/safe-harbor"
 	
-	cp bin/$pkgname.py "$pkgdir/usr/bin"
-	cp systemd/$pkgname@.service "$pkgdir/usr/lib/systemd/system"
-	cp config.json.example "$pkgdir/etc/$pkgname"
+	cp bin/safe-harbor.py "$pkgdir/usr/bin"
+	cp systemd/safe-harbor@.service "$pkgdir/usr/lib/systemd/system"
+	cp config.json.example "$pkgdir/etc/safe-harbor"
 }
diff --git a/systemd/safe-harbor@.service b/systemd/safe-harbor@.service
index 50e0110..daa55b0 100644
--- a/systemd/safe-harbor@.service
+++ b/systemd/safe-harbor@.service
@@ -7,6 +7,3 @@ User=$i
 ExecStart=/usr/bin/python3 /usr/lib/safe-harbor/safe-harbor.py
 Restart=always
 RestartSec=90
-
-[Install]
-WantedBy=multi-user.target