diff --git a/Dockerfiles/ca-certs/README.md b/Dockerfiles/ca-certs/README.md
new file mode 100644
index 0000000..edd38be
--- /dev/null
+++ b/Dockerfiles/ca-certs/README.md
@@ -0,0 +1,5 @@
+# CA Certificate Chains
+
+Add any PEM formated CA certification chain to this directory with an extension
+of '.cert'. If the docker file supports importing CA chains, it will add them
+to the container's system CA store.
diff --git a/Dockerfiles/root/home/build/oxt-patch.header b/Dockerfiles/files/oxt-patch.header
similarity index 100%
rename from Dockerfiles/root/home/build/oxt-patch.header
rename to Dockerfiles/files/oxt-patch.header
diff --git a/Dockerfiles/root/home/build/.quiltrc b/Dockerfiles/files/quiltrc
similarity index 100%
rename from Dockerfiles/root/home/build/.quiltrc
rename to Dockerfiles/files/quiltrc
diff --git a/Dockerfiles/generic-oe64 b/Dockerfiles/generic-oe64
index fce5c50..3c5f59a 100644
--- a/Dockerfiles/generic-oe64
+++ b/Dockerfiles/generic-oe64
@@ -12,9 +12,13 @@ RUN apt-get update && \
         DEBIAN_FRONTEND=noninteractive dpkg-reconfigure dash
 
 # Add "repo" tool (used by many Yocto-based projects)
-RUN curl http://storage.googleapis.com/git-repo-downloads/repo > /usr/local/bin/repo && \
+RUN curl https://storage.googleapis.com/git-repo-downloads/repo > /usr/local/bin/repo && \
         chmod a+x /usr/local/bin/repo
 
+# This copy will include README, but update should ignore
+ADD ca-certs/* /usr/local/share/ca-certificates/
+RUN update-ca-certificates
+
 RUN useradd -Ums /bin/bash -l -p build -u [UID] build && \
         usermod -aG sudo build
 RUN echo "en_US.UTF-8 UTF-8" > /etc/locale.gen && \
diff --git a/Dockerfiles/openxt-bullseye-oe64 b/Dockerfiles/openxt-bullseye-oe64
index 01e096d..6f1af32 100644
--- a/Dockerfiles/openxt-bullseye-oe64
+++ b/Dockerfiles/openxt-bullseye-oe64
@@ -12,7 +12,7 @@ RUN apt-get update && apt-get install -yq \
         sed wget cvs subversion git-core coreutils \
         unzip texi2html texinfo docbook-utils gawk diffstat \
         help2man make gcc build-essential g++ desktop-file-utils chrpath cpio \
-        screen bash-completion python3 iputils-ping \
+        screen bash-completion python3 python-is-python3 iputils-ping \
         guilt iasl quilt bin86 \
         bcc libsdl1.2-dev liburi-perl genisoimage policycoreutils unzip vim \
         rpm curl libncurses5-dev libncursesw5 libc6-dev-i386 libelf-dev \
@@ -34,7 +34,7 @@ RUN cd /tmp && \
         cd /tmp && rm -rf ghc-${GHC_VERSION}
 
 # Add "repo" tool (used by many Yocto-based projects)
-RUN curl http://storage.googleapis.com/git-repo-downloads/repo > /usr/local/bin/repo && \
+RUN curl https://storage.googleapis.com/git-repo-downloads/repo > /usr/local/bin/repo && \
         chmod a+x /usr/local/bin/repo
 
 # Symlink for troublesome packages
@@ -43,8 +43,12 @@ RUN ln -s /lib64/ld-linux-x86-64.so.2 /lib/
 RUN useradd -Ums /bin/bash -l -p '""' -u $UID $UNAME
 
 # Add quilt config files
-ADD root/home/build/.quiltrc /home/build/.quiltrc
-ADD root/home/build/oxt-patch.header /home/build/oxt-patch.header
+ADD files/quiltrc /home/$UNAME/.quiltrc
+ADD files/oxt-patch.header /home/$UNAME/oxt-patch.header
+
+# This copy will include README, but update should ignore
+ADD ca-certs/* /usr/local/share/ca-certificates/
+RUN update-ca-certificates
 
 RUN echo "en_US.UTF-8 UTF-8" > /etc/locale.gen && \
     locale-gen
diff --git a/Dockerfiles/openxt-buster-oe64 b/Dockerfiles/openxt-buster-oe64
index 2fc5c79..8ad1d22 100644
--- a/Dockerfiles/openxt-buster-oe64
+++ b/Dockerfiles/openxt-buster-oe64
@@ -42,7 +42,7 @@ RUN cd /tmp && \
         cd /tmp && rm -rf ghc-6.12.3
 
 # Add "repo" tool (used by many Yocto-based projects)
-RUN curl http://storage.googleapis.com/git-repo-downloads/repo > /usr/local/bin/repo && \
+RUN curl https://storage.googleapis.com/git-repo-downloads/repo > /usr/local/bin/repo && \
         chmod a+x /usr/local/bin/repo
 
 # Symlink for troublesome packages
@@ -51,12 +51,17 @@ RUN ln -s /lib64/ld-linux-x86-64.so.2 /lib/
 RUN useradd -Ums /bin/bash -l -p '""' -u $UID $UNAME
 
 # Add quilt config files
-ADD root/home/build/.quiltrc /home/build/.quiltrc
-ADD root/home/build/oxt-patch.header /home/build/oxt-patch.header
+ADD files/quiltrc /home/$UNAME/.quiltrc
+ADD files/oxt-patch.header /home/$UNAME/oxt-patch.header
 
 RUN echo "en_US.UTF-8 UTF-8" > /etc/locale.gen && \
     locale-gen
 ENV LANG en_US.utf8
+
+# This copy will include README, but update should ignore
+ADD ca-certs/* /usr/local/share/ca-certificates/
+RUN update-ca-certificates
+
 USER $UNAME
 WORKDIR /home/$UNAME
 ENTRYPOINT ["/bin/bash"]
diff --git a/Dockerfiles/openxt-oe32 b/Dockerfiles/openxt-oe32
index 071a678..c4c580b 100644
--- a/Dockerfiles/openxt-oe32
+++ b/Dockerfiles/openxt-oe32
@@ -39,7 +39,7 @@ RUN cd /tmp && \
         cd /tmp && rm -rf ghc-6.12.3
 
 # Add "repo" tool (used by many Yocto-based projects)
-RUN curl http://storage.googleapis.com/git-repo-downloads/repo > /usr/local/bin/repo && \
+RUN curl https://storage.googleapis.com/git-repo-downloads/repo > /usr/local/bin/repo && \
         chmod a+x /usr/local/bin/repo
 
 RUN useradd -Ums /bin/bash -l -p $UNAME -u $UID $UNAME && \
diff --git a/Dockerfiles/openxt-oe64 b/Dockerfiles/openxt-oe64
index 82109d4..9b26072 100644
--- a/Dockerfiles/openxt-oe64
+++ b/Dockerfiles/openxt-oe64
@@ -39,7 +39,7 @@ RUN cd /tmp && \
         cd /tmp && rm -rf ghc-6.12.3
 
 # Add "repo" tool (used by many Yocto-based projects)
-RUN curl http://storage.googleapis.com/git-repo-downloads/repo > /usr/local/bin/repo && \
+RUN curl https://storage.googleapis.com/git-repo-downloads/repo > /usr/local/bin/repo && \
         chmod a+x /usr/local/bin/repo
 
 # Symlink for troublesome packages
@@ -48,8 +48,12 @@ RUN ln -s /lib64/ld-linux-x86-64.so.2 /lib/
 RUN useradd -Ums /bin/bash -l -p '""' -G sudo -u $UID $UNAME
 
 # Add quilt config files
-ADD root/home/build/.quiltrc /home/build/.quiltrc
-ADD root/home/build/oxt-patch.header /home/build/oxt-patch.header
+ADD files/quiltrc /home/$UNAME/.quiltrc
+ADD files/oxt-patch.header /home/$UNAME/oxt-patch.header
+
+# This copy will include README, but update should ignore
+ADD ca-certs/* /usr/local/share/ca-certificates/
+RUN update-ca-certificates
 
 RUN echo "en_US.UTF-8 UTF-8" > /etc/locale.gen && \
     locale-gen