diff --git a/README.md b/README.md
index 89cee89..adce3a5 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,8 @@
 # bookstack-ppm
-[![Build Status](https://cloud.drone.io/api/badges/JJTC-Docker/bookstack-ppm/status.svg)](https://cloud.drone.io/JJTC-Docker/bookstack-ppm)
+[![Build Status](https://cloud.drone.io/api/badges/JJTC-Containers/bookstack-ppm/status.svg)](https://cloud.drone.io/JJTC-Containers/bookstack-ppm)
 [![Docker Pulls](https://img.shields.io/docker/pulls/jjtc/bookstack-ppm.svg?style=flat)](https://hub.docker.com/r/jjtc/bookstack-ppm/) 
-[![Github Stars](https://img.shields.io/github/stars/jjtc-docker/bookstack-ppm.svg?style=flat)](https://github.com/jjtc-docker/bookstack-ppm) 
-[![Github Forks](https://img.shields.io/github/forks/jjtc-docker/bookstack-ppm.svg?style=flat?label=github%20forks)](https://github.com/jjtc-docker/bookstack-ppm)
+[![Github Stars](https://img.shields.io/github/stars/jjtc-containers/bookstack-ppm.svg?style=flat)](https://github.com/jjtc-containers/bookstack-ppm) 
+[![Github Forks](https://img.shields.io/github/forks/jjtc-containers/bookstack-ppm.svg?style=flat?label=github%20forks)](https://github.com/jjtc-containers/bookstack-ppm)
 [![PPM Compatible](https://raw.githubusercontent.com/php-pm/ppm-badge/master/ppm-badge.png)](https://github.com/php-pm/php-pm)
 
 Bookstack setup based on Alpine, Nginx, PHP-PM, MariaDB, Redis & ClamAV for use with Træfik
\ No newline at end of file
diff --git a/app/Dockerfile b/app/Dockerfile
index 6b3a729..e9c71be 100644
--- a/app/Dockerfile
+++ b/app/Dockerfile
@@ -1,6 +1,6 @@
 FROM alpine:3.11
 
-LABEL maintainer="JJTC <docker@jjtc.eu>"
+LABEL maintainer="JJTC <oci@jjtc.eu>"
 
 ENV PPM_VERSION=2.0.3 \
     PPM_HTTP_VERSION=2.0.3 \
@@ -8,11 +8,11 @@ ENV PPM_VERSION=2.0.3 \
     BOOKSTACK_VERSION=0.29.2 \
     BOOKSTACK_HOME="/app"
 
-COPY docker-entrypoint.sh /app/docker-entrypoint.sh
+COPY entrypoint.sh /app/entrypoint.sh
 COPY file_validation.patch /app/file_validation.patch
 
 RUN set -ex \
-  && chmod +x /app/docker-entrypoint.sh \
+  && chmod +x /app/entrypoint.sh \
   # ensure www-data user exists
   # 82 is the standard uid/gid for "www-data" in Alpine
   && addgroup -g 82 -S www-data \
@@ -88,4 +88,4 @@ EXPOSE 8080/tcp
 
 VOLUME ["$BOOKSTACK_HOME/public/uploads", "$BOOKSTACK_HOME/public/storage"]
 
-ENTRYPOINT ["./docker-entrypoint.sh"]
+ENTRYPOINT ["./entrypoint.sh"]
diff --git a/app/docker-entrypoint.sh b/app/entrypoint.sh
similarity index 100%
rename from app/docker-entrypoint.sh
rename to app/entrypoint.sh