diff --git a/Dockerfile b/Dockerfile
index bc377ce..b9cb55b 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,16 +7,16 @@ ARG DESCRIPTION="no description"
 ARG PACKAGE="user/repo"
 ARG VERSION="dirty"
 
-LABEL org.opencontainers.image.ref.name="jnovack/autossh" \
+LABEL org.opencontainers.image.ref.name="${PACKAGE}" \
   org.opencontainers.image.created=$BUILD_RFC3339 \
   org.opencontainers.image.authors="Justin J. Novack <jnovack@gmail.com>" \
-  org.opencontainers.image.documentation="https://github.com/jnovack/docker-autossh/README.md" \
-  org.opencontainers.image.description="Highly customizable AutoSSH docker container." \
+  org.opencontainers.image.documentation="https://github.com/${PACKAGE}/README.md" \
+  org.opencontainers.image.description="${DESCRIPTION}" \
   org.opencontainers.image.licenses="MIT" \
-  org.opencontainers.image.source="https://github.com/jnovack/docker-autossh" \
+  org.opencontainers.image.source="https://github.com/${PACKAGE}" \
   org.opencontainers.image.revision=$REVISION \
   org.opencontainers.image.version=$VERSION \
-  org.opencontainers.image.url="https://hub.docker.com/r/jnovack/autossh/"
+  org.opencontainers.image.url="https://hub.docker.com/r/${PACKAGE}/"
 
 RUN \
   apk --no-cache add \
diff --git a/Dockerfile.arm32v6 b/Dockerfile.arm32v6
index eddfba0..74a1289 100644
--- a/Dockerfile.arm32v6
+++ b/Dockerfile.arm32v6
@@ -10,16 +10,16 @@ ARG DESCRIPTION="no description"
 ARG PACKAGE="user/repo"
 ARG VERSION="dirty"
 
-LABEL org.opencontainers.image.ref.name="jnovack/autossh" \
+LABEL org.opencontainers.image.ref.name="${PACKAGE}" \
   org.opencontainers.image.created=$BUILD_RFC3339 \
   org.opencontainers.image.authors="Justin J. Novack <jnovack@gmail.com>" \
-  org.opencontainers.image.documentation="https://github.com/jnovack/docker-autossh/README.md" \
-  org.opencontainers.image.description="Highly customizable AutoSSH docker container." \
+  org.opencontainers.image.documentation="https://github.com/${PACKAGE}/README.md" \
+  org.opencontainers.image.description="${DESCRIPTION}" \
   org.opencontainers.image.licenses="MIT" \
-  org.opencontainers.image.source="https://github.com/jnovack/docker-autossh" \
+  org.opencontainers.image.source="https://github.com/${PACKAGE}" \
   org.opencontainers.image.revision=$REVISION \
   org.opencontainers.image.version=$VERSION \
-  org.opencontainers.image.url="https://hub.docker.com/r/jnovack/autossh/"
+  org.opencontainers.image.url="https://hub.docker.com/r/${PACKAGE}/"
 
 RUN \
   apk --no-cache add \
diff --git a/Dockerfile.arm32v7 b/Dockerfile.arm32v7
index 5508230..7d00a95 100644
--- a/Dockerfile.arm32v7
+++ b/Dockerfile.arm32v7
@@ -10,16 +10,16 @@ ARG DESCRIPTION="no description"
 ARG PACKAGE="user/repo"
 ARG VERSION="dirty"
 
-LABEL org.opencontainers.image.ref.name="jnovack/autossh" \
+LABEL org.opencontainers.image.ref.name="${PACKAGE}" \
   org.opencontainers.image.created=$BUILD_RFC3339 \
   org.opencontainers.image.authors="Justin J. Novack <jnovack@gmail.com>" \
-  org.opencontainers.image.documentation="https://github.com/jnovack/docker-autossh/README.md" \
-  org.opencontainers.image.description="Highly customizable AutoSSH docker container." \
+  org.opencontainers.image.documentation="https://github.com/${PACKAGE}/README.md" \
+  org.opencontainers.image.description="${DESCRIPTION}" \
   org.opencontainers.image.licenses="MIT" \
-  org.opencontainers.image.source="https://github.com/jnovack/docker-autossh" \
+  org.opencontainers.image.source="https://github.com/${PACKAGE}" \
   org.opencontainers.image.revision=$REVISION \
   org.opencontainers.image.version=$VERSION \
-  org.opencontainers.image.url="https://hub.docker.com/r/jnovack/autossh/"
+  org.opencontainers.image.url="https://hub.docker.com/r/${PACKAGE}/"
 
 RUN \
   apk --no-cache add \
diff --git a/Dockerfile.arm64v8 b/Dockerfile.arm64v8
index f0808a1..912619c 100644
--- a/Dockerfile.arm64v8
+++ b/Dockerfile.arm64v8
@@ -10,16 +10,16 @@ ARG DESCRIPTION="no description"
 ARG PACKAGE="user/repo"
 ARG VERSION="dirty"
 
-LABEL org.opencontainers.image.ref.name="jnovack/autossh" \
+LABEL org.opencontainers.image.ref.name="${PACKAGE}" \
   org.opencontainers.image.created=$BUILD_RFC3339 \
   org.opencontainers.image.authors="Justin J. Novack <jnovack@gmail.com>" \
-  org.opencontainers.image.documentation="https://github.com/jnovack/docker-autossh/README.md" \
-  org.opencontainers.image.description="Highly customizable AutoSSH docker container." \
+  org.opencontainers.image.documentation="https://github.com/${PACKAGE}/README.md" \
+  org.opencontainers.image.description="${DESCRIPTION}" \
   org.opencontainers.image.licenses="MIT" \
-  org.opencontainers.image.source="https://github.com/jnovack/docker-autossh" \
+  org.opencontainers.image.source="https://github.com/${PACKAGE}" \
   org.opencontainers.image.revision=$REVISION \
   org.opencontainers.image.version=$VERSION \
-  org.opencontainers.image.url="https://hub.docker.com/r/jnovack/autossh/"
+  org.opencontainers.image.url="https://hub.docker.com/r/${PACKAGE}/"
 
 RUN \
   apk --no-cache add \
diff --git a/README.md b/README.md
index 04d971e..1c4153e 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # docker-autossh
 
 [![Docker](https://badgen.net/badge/jnovack/autossh/blue?icon=docker)](https://hub.docker.com/r/jnovack/autossh)
-[![Github](https://badgen.net/badge/jnovack/docker-autossh/purple?icon=github)](https://github.com/jnovack/docker-autossh)
+[![Github](https://badgen.net/badge/jnovack/autossh/purple?icon=github)](https://github.com/jnovack/autossh)
 
 Highly customizable AutoSSH docker container.
 
@@ -108,7 +108,7 @@ ensure the key for the container is separate from your normal user key in the
 event there is ever a need to revoke one or the other.
 
 ```text
-$ ssh-keygen -t rsa -b 4096 -C "docker-autossh" -f autossh_id_rsa
+$ ssh-keygen -t rsa -b 4096 -C "autossh" -f autossh_id_rsa
 Generating public/private rsa key pair.
 Enter file in which to save the key (/home/jnovack/autossh_id_rsa):
 Enter passphrase (empty for no passphrase):
@@ -116,7 +116,7 @@ Enter same passphrase again:
 Your identification has been saved in /home/jnovack/autossh_id_rsa.
 Your public key has been saved in /home/jnovack/autossh_id_rsa.pub.
 The key fingerprint is:
-00:11:22:33:44:55:66:77:88:99:aa:bb:cc:dd:ee:ff docker-autossh
+00:11:22:33:44:55:66:77:88:99:aa:bb:cc:dd:ee:ff autossh
 The key's randomart image is:
 +-----[ RSA 4096]-----+
 |     _.-'''''-._     |