diff --git a/Dockerfile b/Dockerfile
index 44866305..922c76c5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM statping/statping:base AS base
+FROM aboutcher/statping-ng:base AS base
 ARG BUILDPLATFORM
 # Statping main Docker image that contains all required libraries
 FROM alpine:latest
diff --git a/Dockerfile.base b/Dockerfile.base
index 44c8ccb5..a2ae0f98 100644
--- a/Dockerfile.base
+++ b/Dockerfile.base
@@ -1,5 +1,5 @@
 FROM node:12.18.2-alpine AS frontend
-LABEL maintainer="Hunter Long (https://github.com/hunterlong)"
+LABEL maintainer="Statping-NG (https://github.com/statping-ng)"
 ARG BUILDPLATFORM
 WORKDIR /statping
 COPY ./frontend/package.json .
@@ -11,7 +11,7 @@ RUN yarn build && yarn cache clean
 # Statping Golang BACKEND building from source
 # Creates "/go/bin/statping" and "/usr/local/bin/sass" for copying
 FROM golang:1.14-alpine AS backend
-LABEL maintainer="Hunter Long (https://github.com/hunterlong)"
+LABEL maintainer="Statping-NG (https://github.com/statping-ng)"
 ARG VERSION
 ARG COMMIT
 ARG BUILDPLATFORM
@@ -25,7 +25,7 @@ RUN git clone https://github.com/sass/sassc.git
 RUN . sassc/script/bootstrap && make -C sassc -j4
 # sassc binary: /root/sassc/bin/sassc
 
-WORKDIR /go/src/github.com/statping/statping
+WORKDIR /go/src/github.com/statping-ng/statping-ng
 ADD go.mod go.sum ./
 RUN go mod download
 ENV GO111MODULE on
diff --git a/docker-compose.yml b/docker-compose.yml
index a276180a..38533e5a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,7 +3,7 @@ version: '2.3'
 services:
   statping:
     container_name: statping
-    image: statping/statping:dev
+    image: aboutcher/statping-ng:dev
     restart: always
     volumes:
       - statping_data:/app