diff --git a/INSTALL.md b/INSTALL.md
index de9466c..288d8b2 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -21,11 +21,11 @@ This installation guide is written assuming you are on a Linux-like operating sy
 
 You can download the latest version of the wubloader from github:
 
-  https://github.com/ekimekim/wubloader/archive/master.zip
+  https://github.com/dbvideostriketeam/wubloader/archive/master.zip
   
 Alternatively if you have `git` installed you can clone the git repository:
 
-  `git clone https://github.com/ekimekim/wubloader`
+  `git clone https://github.com/dbvideostriketeam/wubloader`
   
   
 ## Generate the docker-compose file
diff --git a/api_ping/Dockerfile b/api_ping/Dockerfile
index 4a414d9..202878e 100644
--- a/api_ping/Dockerfile
+++ b/api_ping/Dockerfile
@@ -14,5 +14,5 @@ RUN pip install /tmp/common && rm -r /tmp/common
 COPY api_ping /tmp/api_ping
 RUN pip install /tmp/api_ping && rm -r /tmp/api_ping
 
-LABEL org.opencontainers.image.source https://github.com/ekimekim/wubloader
+LABEL org.opencontainers.image.source https://github.com/dbvideostriketeam/wubloader
 ENTRYPOINT ["python3", "-m", "api_ping"]
diff --git a/backfiller/Dockerfile b/backfiller/Dockerfile
index 011e5d3..80c87f2 100644
--- a/backfiller/Dockerfile
+++ b/backfiller/Dockerfile
@@ -15,5 +15,5 @@ RUN apk add postgresql-dev postgresql-libs
 COPY backfiller /tmp/backfiller
 RUN pip install /tmp/backfiller && rm -r /tmp/backfiller
 
-LABEL org.opencontainers.image.source https://github.com/ekimekim/wubloader
+LABEL org.opencontainers.image.source https://github.com/dbvideostriketeam/wubloader
 ENTRYPOINT ["python3", "-m", "backfiller", "--base-dir", "/mnt"]
diff --git a/build b/build
index 8134de2..277238b 100755
--- a/build
+++ b/build
@@ -17,7 +17,7 @@ COMPONENTS=(downloader restreamer backfiller thrimshim cutter sheetsync nginx po
 PUSH=${PUSH:-}
 
 # Base is the repository namespace information, not including the wubloader-component part.
-BASE="ghcr.io/ekimekim"
+BASE="ghcr.io/dbvideostriketeam"
 
 # The docker image tag, derived from the git commit + whether working tree is clean
 TAG=$(./get-build-tag)
diff --git a/chat_archiver/Dockerfile b/chat_archiver/Dockerfile
index be3de21..61e0dfd 100644
--- a/chat_archiver/Dockerfile
+++ b/chat_archiver/Dockerfile
@@ -18,5 +18,5 @@ RUN pip install /tmp/common && rm -r /tmp/common
 COPY chat_archiver /tmp/archiver
 RUN pip install /tmp/archiver && rm -r /tmp/archiver
 
-LABEL org.opencontainers.image.source https://github.com/ekimekim/wubloader
+LABEL org.opencontainers.image.source https://github.com/dbvideostriketeam/wubloader
 ENTRYPOINT ["python3", "-m", "chat_archiver", "--base-dir", "/mnt"]
diff --git a/cutter/Dockerfile b/cutter/Dockerfile
index b0ab945..ed943ad 100644
--- a/cutter/Dockerfile
+++ b/cutter/Dockerfile
@@ -15,5 +15,5 @@ RUN apk add postgresql-dev postgresql-client ffmpeg
 COPY cutter /tmp/cutter
 RUN pip install /tmp/cutter && rm -r /tmp/cutter
 
-LABEL org.opencontainers.image.source https://github.com/ekimekim/wubloader
+LABEL org.opencontainers.image.source https://github.com/dbvideostriketeam/wubloader
 ENTRYPOINT ["python3", "-m", "cutter", "--base-dir", "/mnt"]
diff --git a/docker-compose.jsonnet b/docker-compose.jsonnet
index 9be767d..8a3a2a1 100644
--- a/docker-compose.jsonnet
+++ b/docker-compose.jsonnet
@@ -13,7 +13,7 @@
   // you're actually running, and must manually re-pull to get an updated copy.
   image_tag:: std.extVar("tag"),
   database_tag:: "bb05e37", // tag for DB, which changes less and restarts are disruptive
-  image_base:: "ghcr.io/ekimekim", // Change this to use images from a different source than the main one
+  image_base:: "ghcr.io/dbvideostriketeam", // Change this to use images from a different source than the main one
 
   // For each service, whether to deploy that service.
   enabled:: {
diff --git a/downloader/Dockerfile b/downloader/Dockerfile
index db8f9bf..8574dbb 100644
--- a/downloader/Dockerfile
+++ b/downloader/Dockerfile
@@ -14,5 +14,5 @@ RUN pip install /tmp/common && rm -r /tmp/common
 COPY downloader /tmp/downloader
 RUN pip install /tmp/downloader && rm -r /tmp/downloader
 
-LABEL org.opencontainers.image.source https://github.com/ekimekim/wubloader
+LABEL org.opencontainers.image.source https://github.com/dbvideostriketeam/wubloader
 ENTRYPOINT ["python3", "-m", "downloader", "--base-dir", "/mnt"]
diff --git a/k8s.jsonnet b/k8s.jsonnet
index 4afeabe..c2b2288 100644
--- a/k8s.jsonnet
+++ b/k8s.jsonnet
@@ -201,7 +201,7 @@
   // This function generates deployments for each service, since they only differ slightly,
   // with only a different image, CLI args and possibly env vars.
   // The image name is derived from the component name
-  // (eg. "downloader" is ghcr.io/ekimekim/wubloader-downloader)
+  // (eg. "downloader" is ghcr.io/dbvideostriketeam/wubloader-downloader)
   // so we only pass in name as a required arg.
   // Optional kwargs work just like python.
   deployment(name, args=[], env=[], volumes=[], volumeMounts=[]):: {
@@ -226,7 +226,7 @@
               name: name,
               // segment-coverage is called segment_coverage in the image, so replace - with _
               // ditto for playlist-manager
-              image: "ghcr.io/ekimekim/wubloader-%s:%s" % [std.strReplace(name, "-", "_"), $.config.image_tag],
+              image: "ghcr.io/dbvideostriketeam/wubloader-%s:%s" % [std.strReplace(name, "-", "_"), $.config.image_tag],
               args: args,
               volumeMounts: [{name: "data", mountPath: "/mnt"}] + volumeMounts,
               env: $.env_list + env, // main env list combined with any deployment-specific ones
@@ -279,7 +279,7 @@
           containers: [
             {
               name: name,
-              image: "ghcr.io/ekimekim/wubloader-%s:%s" % [name, $.config.database_tag],
+              image: "ghcr.io/dbvideostriketeam/wubloader-%s:%s" % [name, $.config.database_tag],
               args: args,
               env: $.env_list + env, // main env list combined with any statefulset-specific ones
               volumeMounts: [
diff --git a/nginx/Dockerfile b/nginx/Dockerfile
index 6871061..c234df1 100644
--- a/nginx/Dockerfile
+++ b/nginx/Dockerfile
@@ -2,5 +2,5 @@
 FROM nginx:latest
 ADD nginx/generate-config /
 COPY thrimbletrimmer /etc/nginx/html/thrimbletrimmer
-LABEL org.opencontainers.image.source https://github.com/ekimekim/wubloader
+LABEL org.opencontainers.image.source https://github.com/dbvideostriketeam/wubloader
 ENTRYPOINT ["/bin/sh", "-c", "/generate-config && nginx -g \"daemon off;\""]
diff --git a/playlist_manager/Dockerfile b/playlist_manager/Dockerfile
index 36c1d05..2d30ebd 100644
--- a/playlist_manager/Dockerfile
+++ b/playlist_manager/Dockerfile
@@ -14,5 +14,5 @@ RUN pip install /tmp/common && rm -r /tmp/common
 COPY playlist_manager /tmp/playlist_manager
 RUN pip install /tmp/playlist_manager && rm -r /tmp/playlist_manager
 
-LABEL org.opencontainers.image.source https://github.com/ekimekim/wubloader
+LABEL org.opencontainers.image.source https://github.com/dbvideostriketeam/wubloader
 ENTRYPOINT ["python3", "-m", "playlist_manager"]
diff --git a/postgres/Dockerfile b/postgres/Dockerfile
index 42986b0..53de94d 100644
--- a/postgres/Dockerfile
+++ b/postgres/Dockerfile
@@ -2,5 +2,5 @@ FROM postgres:12
 COPY postgres/setup.sh /docker-entrypoint-initdb.d/setup.sh
 RUN chmod 0666 /docker-entrypoint-initdb.d/setup.sh
 COPY postgres/standby_setup.sh /standby_setup.sh
-LABEL org.opencontainers.image.source https://github.com/ekimekim/wubloader
+LABEL org.opencontainers.image.source https://github.com/dbvideostriketeam/wubloader
 RUN chmod 0700 /standby_setup.sh
diff --git a/restreamer/Dockerfile b/restreamer/Dockerfile
index 451a6d0..f65085f 100644
--- a/restreamer/Dockerfile
+++ b/restreamer/Dockerfile
@@ -15,5 +15,5 @@ RUN apk add ffmpeg
 COPY restreamer /tmp/restreamer
 RUN pip install /tmp/restreamer && rm -r /tmp/restreamer
 
-LABEL org.opencontainers.image.source https://github.com/ekimekim/wubloader
+LABEL org.opencontainers.image.source https://github.com/dbvideostriketeam/wubloader
 ENTRYPOINT ["python3", "-m", "restreamer", "--base-dir", "/mnt"]
diff --git a/segment_coverage/Dockerfile b/segment_coverage/Dockerfile
index 20d6553..0059f72 100644
--- a/segment_coverage/Dockerfile
+++ b/segment_coverage/Dockerfile
@@ -21,5 +21,5 @@ RUN ln -s /usr/include/locale.h /usr/include/xlocale.h \
 COPY segment_coverage /tmp/segment_coverage
 RUN pip install /tmp/segment_coverage && rm -r /tmp/segment_coverage
 
-LABEL org.opencontainers.image.source https://github.com/ekimekim/wubloader
+LABEL org.opencontainers.image.source https://github.com/dbvideostriketeam/wubloader
 ENTRYPOINT ["python3", "-m", "segment_coverage"]
diff --git a/sheetsync/Dockerfile b/sheetsync/Dockerfile
index 85b2c82..afb64bc 100644
--- a/sheetsync/Dockerfile
+++ b/sheetsync/Dockerfile
@@ -15,5 +15,5 @@ RUN apk add postgresql-dev postgresql-client
 COPY sheetsync /tmp/sheetsync
 RUN pip install /tmp/sheetsync && rm -r /tmp/sheetsync
 
-LABEL org.opencontainers.image.source https://github.com/ekimekim/wubloader
+LABEL org.opencontainers.image.source https://github.com/dbvideostriketeam/wubloader
 ENTRYPOINT ["python3", "-m", "sheetsync"]
diff --git a/thrimshim/Dockerfile b/thrimshim/Dockerfile
index 8efabc8..15cddf9 100644
--- a/thrimshim/Dockerfile
+++ b/thrimshim/Dockerfile
@@ -15,5 +15,5 @@ RUN apk add postgresql-dev postgresql-libs
 COPY thrimshim /tmp/thrimshim
 RUN pip install /tmp/thrimshim && rm -r /tmp/thrimshim
 
-LABEL org.opencontainers.image.source https://github.com/ekimekim/wubloader
+LABEL org.opencontainers.image.source https://github.com/dbvideostriketeam/wubloader
 ENTRYPOINT ["python3", "-m", "thrimshim"]