diff --git a/ContainerCanary/canary_darwin_amd64 b/ContainerCanary/canary_darwin_amd64
deleted file mode 100755
index ecf9384..0000000
Binary files a/ContainerCanary/canary_darwin_amd64 and /dev/null differ
diff --git a/ContainerCanary/canary_darwin_amd64.sha256sum b/ContainerCanary/canary_darwin_amd64.sha256sum
deleted file mode 100644
index eefd8a9..0000000
--- a/ContainerCanary/canary_darwin_amd64.sha256sum
+++ /dev/null
@@ -1 +0,0 @@
-dc69476f0b0868369d46482a4c0e56576877ed6796352b5b98edfbbeb50b90b7  canary_darwin_amd64
diff --git a/ContainerCanary/ckan.yaml b/ContainerCanary/ckan.yaml
deleted file mode 100644
index f394116..0000000
--- a/ContainerCanary/ckan.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
-# ckan.yaml
-apiVersion: container-canary.nvidia.com/v1
-kind: Validator
-name: ckan
-description: ckan container validator
-ports:
-  - port: 5000
-    protocol: TCP
-checks:
-  - name: uwsgi
-    description: Is the correct number of uwsgi processes running?
-    probe:
-      exec:
-        command:
-          - /bin/sh
-          - -c
-          - "[ `ps auxww | awk '{print $4 }' | grep uwsgi | wc -l` = 4 ]"
-  - name: listening
-    description: Is CKAN listening on port 5000?
-    probe:
-      httpGet:
-        path: /
-        port: 5000
-      initialDelaySeconds: 10
-  - name: status_show
-    description: Is CKAN status_show accessible?
-    probe:
-      httpGet:
-        path: /api/3/action/status_show
-        port: 5000
-      initialDelaySeconds: 10
-      periodSeconds: 10
-      failureThreshold: 6
-      timeoutSeconds: 10
\ No newline at end of file
diff --git a/README.ContainerCanary.txt b/README.ContainerCanary.txt
deleted file mode 100644
index f759fb1..0000000
--- a/README.ContainerCanary.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-To install Container Canary do the following:
-
-curl -L https://github.com/NVIDIA/container-canary/releases/download/v0.2.1/canary_darwin_amd64 > /path/to/ContainerCanary/canary_darwin_amd64
-curl -L https://github.com/NVIDIA/container-canary/releases/download/v0.2.1/canary_darwin_amd64.sha256sum > /path/to/ContainerCanary/canary_darwin_amd64.sha256sum
-
-cd /path/to/ContainerCanary
-
-shasum -a 256 --check --status canary_darwin_amd64.sha256sum
-chmod +x canary_darwin_amd64
-cp canary_darwin_amd64 /usr/local/bin/canary
-
-/usr/local/bin/canary version
-
-Should show something like this:
-Container Canary
- Version:         v0.2.1
- Go Version:      go1.17.8
- Commit:          d97ec23
- OS/Arch:         darwin/amd64
- Built:           2022-04-14T10:03:44Z
-
-Create a file used for validation (call it ckan.yaml)
-
-Run the following:
-canary validate --file ckan.yaml ckan/ckan-base:2.9.5
-
-Make sure a CKAN container using the same port as ckan/ckan-base:2.9.5 is not running before starting the validation
\ No newline at end of file
diff --git a/ckan-2.10/base/Dockerfile b/ckan-2.10/base/Dockerfile
index 404fb7e..52a5eb0 100644
--- a/ckan-2.10/base/Dockerfile
+++ b/ckan-2.10/base/Dockerfile
@@ -76,7 +76,6 @@ COPY setup/supervisord.conf /etc
 # Install CKAN
 RUN pip3 install -e git+${GIT_URL}@${GIT_BRANCH}#egg=ckan && \
     cd ${SRC_DIR}/ckan && \
-    cp who.ini ${APP_DIR} && \
     pip3 install --no-binary markdown -r requirements.txt && \
     # Install CKAN envvars to support loading config from environment variables
     pip3 install -e git+https://github.com/okfn/ckanext-envvars.git#egg=ckanext-envvars && \
diff --git a/ckan-2.11/base/Dockerfile b/ckan-2.11/base/Dockerfile
index a5fd3a0..59128c6 100644
--- a/ckan-2.11/base/Dockerfile
+++ b/ckan-2.11/base/Dockerfile
@@ -47,20 +47,12 @@ RUN apt-get install --no-install-recommends -y \
 # Create the src directory
 RUN mkdir -p ${SRC_DIR}
 
-# Install supervisord and create the supervisord.d directory
-RUN apt-get install --no-install-recommends -y \
-        supervisor && \
-        mkdir /etc/supervisord.d
-
-COPY setup/supervisord.conf /etc
-
 # Install uwsgi, the CKAN application, the dependency packages for CKAN plus some confiquration
 RUN pip3 install -U pip && \
     pip3 install uwsgi && \
     cd ${SRC_DIR} && \
     pip3 install -e git+${GIT_URL}@${CKAN_VERSION}#egg=ckan && \
     cd ckan && \
-    cp who.ini ${APP_DIR} && \
     pip3 install --no-binary markdown -r requirements.txt && \
     # Install CKAN envvars to support loading config from environment variables
     pip3 install -e git+https://github.com/okfn/ckanext-envvars.git#egg=ckanext-envvars && \
@@ -85,6 +77,4 @@ ONBUILD RUN mkdir /docker-entrypoint.d
 
 EXPOSE 5000
 
-HEALTHCHECK --interval=60s --timeout=5s --retries=5 CMD curl --fail http://localhost:5000/api/3/action/status_show || exit CMD ["/srv/app/start_ckan.sh"]
-
 CMD ["/srv/app/start_ckan.sh"]
diff --git a/ckan-2.11/base/setup/start_ckan.sh b/ckan-2.11/base/setup/start_ckan.sh
index 295174c..949d11f 100755
--- a/ckan-2.11/base/setup/start_ckan.sh
+++ b/ckan-2.11/base/setup/start_ckan.sh
@@ -47,8 +47,6 @@ UWSGI_OPTS="--plugins http,python \
 
 if [ $? -eq 0 ]
 then
-    # Start supervisord
-    supervisord --configuration /etc/supervisord.conf &
     # Start uwsgi
     uwsgi $UWSGI_OPTS
 else
diff --git a/ckan-2.11/base/setup/supervisord.conf b/ckan-2.11/base/setup/supervisord.conf
deleted file mode 100644
index a3f6671..0000000
--- a/ckan-2.11/base/setup/supervisord.conf
+++ /dev/null
@@ -1,23 +0,0 @@
-[unix_http_server]
-file = /tmp/supervisor.sock
-chmod = 0777
-chown = nobody:nogroup
-
-[supervisord]
-logfile = /tmp/supervisord.log
-logfile_maxbytes = 50MB
-logfile_backups=10
-loglevel = info
-pidfile = /tmp/supervisord.pid
-nodaemon = true
-umask = 022
-identifier = supervisor
-
-[supervisorctl]
-serverurl = unix:///tmp/supervisor.sock
-
-[rpcinterface:supervisor]
-supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
-
-[include]
-files = /etc/supervisord.d/*.conf
diff --git a/ckan-2.11/base/setup/uwsgi.conf b/ckan-2.11/base/setup/uwsgi.conf
deleted file mode 100644
index 6321d6d..0000000
--- a/ckan-2.11/base/setup/uwsgi.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-[uwsgi]
-route = ^(?!/api).*$ basicauth:Restricted,/srv/app/.htpasswd
diff --git a/ckan-master/base/Dockerfile b/ckan-master/base/Dockerfile
index a5fd3a0..59128c6 100644
--- a/ckan-master/base/Dockerfile
+++ b/ckan-master/base/Dockerfile
@@ -47,20 +47,12 @@ RUN apt-get install --no-install-recommends -y \
 # Create the src directory
 RUN mkdir -p ${SRC_DIR}
 
-# Install supervisord and create the supervisord.d directory
-RUN apt-get install --no-install-recommends -y \
-        supervisor && \
-        mkdir /etc/supervisord.d
-
-COPY setup/supervisord.conf /etc
-
 # Install uwsgi, the CKAN application, the dependency packages for CKAN plus some confiquration
 RUN pip3 install -U pip && \
     pip3 install uwsgi && \
     cd ${SRC_DIR} && \
     pip3 install -e git+${GIT_URL}@${CKAN_VERSION}#egg=ckan && \
     cd ckan && \
-    cp who.ini ${APP_DIR} && \
     pip3 install --no-binary markdown -r requirements.txt && \
     # Install CKAN envvars to support loading config from environment variables
     pip3 install -e git+https://github.com/okfn/ckanext-envvars.git#egg=ckanext-envvars && \
@@ -85,6 +77,4 @@ ONBUILD RUN mkdir /docker-entrypoint.d
 
 EXPOSE 5000
 
-HEALTHCHECK --interval=60s --timeout=5s --retries=5 CMD curl --fail http://localhost:5000/api/3/action/status_show || exit CMD ["/srv/app/start_ckan.sh"]
-
 CMD ["/srv/app/start_ckan.sh"]
diff --git a/ckan-master/base/setup/start_ckan.sh b/ckan-master/base/setup/start_ckan.sh
index 295174c..949d11f 100755
--- a/ckan-master/base/setup/start_ckan.sh
+++ b/ckan-master/base/setup/start_ckan.sh
@@ -47,8 +47,6 @@ UWSGI_OPTS="--plugins http,python \
 
 if [ $? -eq 0 ]
 then
-    # Start supervisord
-    supervisord --configuration /etc/supervisord.conf &
     # Start uwsgi
     uwsgi $UWSGI_OPTS
 else
diff --git a/ckan-master/base/setup/supervisord.conf b/ckan-master/base/setup/supervisord.conf
deleted file mode 100644
index a3f6671..0000000
--- a/ckan-master/base/setup/supervisord.conf
+++ /dev/null
@@ -1,23 +0,0 @@
-[unix_http_server]
-file = /tmp/supervisor.sock
-chmod = 0777
-chown = nobody:nogroup
-
-[supervisord]
-logfile = /tmp/supervisord.log
-logfile_maxbytes = 50MB
-logfile_backups=10
-loglevel = info
-pidfile = /tmp/supervisord.pid
-nodaemon = true
-umask = 022
-identifier = supervisor
-
-[supervisorctl]
-serverurl = unix:///tmp/supervisor.sock
-
-[rpcinterface:supervisor]
-supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
-
-[include]
-files = /etc/supervisord.d/*.conf
diff --git a/ckan-master/base/setup/uwsgi.conf b/ckan-master/base/setup/uwsgi.conf
deleted file mode 100644
index 6321d6d..0000000
--- a/ckan-master/base/setup/uwsgi.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-[uwsgi]
-route = ^(?!/api).*$ basicauth:Restricted,/srv/app/.htpasswd