diff --git a/Makefile b/Makefile
index ddcd377..660f52f 100644
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,7 @@ rpm_node8:
 			-e "NODE_VERSION=v8.0.0" \
 			-e "RPM_NODE_VERSION=8" \
 			-e "HASTIC_RELEASE_VERSION=`cat server/package.json| jq -r .version | sed 's/-/_/g'`" \
-			amper43/hastic-rpmbuilder rpmbuild -bb rpm/hastic-server.spec
+			hastic/rpmbuilder rpmbuild -bb rpm/hastic-server.spec
 
 rpm_node6:
 	docker run --rm -v `pwd`/server:/root/rpmbuild/server \
@@ -22,6 +22,6 @@ rpm_node6:
 			-e "NODE_VERSION=v6.14.0" \
 			-e "RPM_NODE_VERSION=6" \
 			-e "HASTIC_RELEASE_VERSION=`cat server/package.json| jq -r .version | sed 's/-/_/g'`" \
-			amper43/hastic-rpmbuilder rpmbuild -bb rpm/hastic-server.spec
+			hastic/rpmbuilder rpmbuild -bb rpm/hastic-server.spec
 
 rpm: rpm_node8 rpm_node6
diff --git a/build/rpmbuild/Makefile b/build/rpmbuild/Makefile
index 0daa92c..75d4527 100644
--- a/build/rpmbuild/Makefile
+++ b/build/rpmbuild/Makefile
@@ -1,3 +1,3 @@
 all:
-	docker build  -t amper43/hastic-rpmbuilder .
-	docker push amper43/hastic-rpmbuilder
+	docker build  -t hastic/rpmbuilder .
+	docker push hastic/rpmbuilder