diff --git a/docker/centos/source/swift/swift-account-server/Dockerfile b/docker/centos/source/swift/swift-account-server/Dockerfile
new file mode 100644
index 0000000000..fc97fa8d3d
--- /dev/null
+++ b/docker/centos/source/swift/swift-account-server/Dockerfile
@@ -0,0 +1,7 @@
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-base:%%KOLLA_TAG%%
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
+
+COPY start.sh /
+COPY config-internal.sh config-external.sh /opt/kolla/
+
+CMD ["/start.sh"]
diff --git a/docker/centos/source/swift/swift-account-server/build b/docker/centos/source/swift/swift-account-server/build
new file mode 120000
index 0000000000..ec19138031
--- /dev/null
+++ b/docker/centos/source/swift/swift-account-server/build
@@ -0,0 +1 @@
+../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/swift/swift-account-server/config-external.sh b/docker/centos/source/swift/swift-account-server/config-external.sh
new file mode 120000
index 0000000000..93a15ca3b8
--- /dev/null
+++ b/docker/centos/source/swift/swift-account-server/config-external.sh
@@ -0,0 +1 @@
+../../../../../docker/common/swift/swift-account-server/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/source/swift/swift-account-server/config-internal.sh b/docker/centos/source/swift/swift-account-server/config-internal.sh
new file mode 120000
index 0000000000..93174deb08
--- /dev/null
+++ b/docker/centos/source/swift/swift-account-server/config-internal.sh
@@ -0,0 +1 @@
+../../../../../docker/common/swift/swift-account-server/config-internal.sh
\ No newline at end of file
diff --git a/docker/centos/source/swift/swift-account-server/start.sh b/docker/centos/source/swift/swift-account-server/start.sh
new file mode 120000
index 0000000000..acf6b18d74
--- /dev/null
+++ b/docker/centos/source/swift/swift-account-server/start.sh
@@ -0,0 +1 @@
+../../../../../docker/common/swift/swift-account-server/start.sh
\ No newline at end of file
diff --git a/docker/centos/source/swift/swift-base/.buildinfo b/docker/centos/source/swift/swift-base/.buildinfo
new file mode 100644
index 0000000000..ca6e05edef
--- /dev/null
+++ b/docker/centos/source/swift/swift-base/.buildinfo
@@ -0,0 +1,10 @@
+# Build info specific to this image. All values can be overridden in .buildconf
+
+COMPONENT=swift
+SOURCE_INSTALL_AVAILABLE=1
+
+# Used for git install method
+: ${CLONE_FROM:=https://github.com/openstack/swift}
+
+# Used for curl install method
+: ${TARBALL_URI:=http://tarballs.openstack.org/swift/swift-master.tar.gz}
diff --git a/docker/centos/source/swift/swift-base/Dockerfile b/docker/centos/source/swift/swift-base/Dockerfile
new file mode 100644
index 0000000000..2a983963b0
--- /dev/null
+++ b/docker/centos/source/swift/swift-base/Dockerfile
@@ -0,0 +1,19 @@
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
+
+ADD ./swift.tar /
+RUN ln -s /swift-* /swift
+
+RUN cd /swift \
+    && useradd --user-group swift \
+    && pip install -r requirements.txt \
+    && pip install /swift \
+    && mkdir /etc/swift /var/log/swift \
+    && cp -r /swift/etc/* /etc/swift/ \
+    && rm -rf /root/.cache
+
+COPY config-swift.sh build-swift-ring.py /opt/kolla/
+
+RUN mkdir /opt/swift
+
+CMD ["/start.sh"]
diff --git a/docker/centos/source/swift/swift-base/build b/docker/centos/source/swift/swift-base/build
new file mode 120000
index 0000000000..ec19138031
--- /dev/null
+++ b/docker/centos/source/swift/swift-base/build
@@ -0,0 +1 @@
+../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/swift/swift-base/build-swift-ring.py b/docker/centos/source/swift/swift-base/build-swift-ring.py
new file mode 120000
index 0000000000..325bf93c5b
--- /dev/null
+++ b/docker/centos/source/swift/swift-base/build-swift-ring.py
@@ -0,0 +1 @@
+../../../../../docker/common/swift/swift-base/build-swift-ring.py
\ No newline at end of file
diff --git a/docker/centos/source/swift/swift-base/config-swift.sh b/docker/centos/source/swift/swift-base/config-swift.sh
new file mode 120000
index 0000000000..fb883f4829
--- /dev/null
+++ b/docker/centos/source/swift/swift-base/config-swift.sh
@@ -0,0 +1 @@
+../../../../../docker/common/swift/swift-base/config-swift.sh
\ No newline at end of file
diff --git a/docker/centos/source/swift/swift-container-server/Dockerfile b/docker/centos/source/swift/swift-container-server/Dockerfile
new file mode 100644
index 0000000000..fc97fa8d3d
--- /dev/null
+++ b/docker/centos/source/swift/swift-container-server/Dockerfile
@@ -0,0 +1,7 @@
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-base:%%KOLLA_TAG%%
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
+
+COPY start.sh /
+COPY config-internal.sh config-external.sh /opt/kolla/
+
+CMD ["/start.sh"]
diff --git a/docker/centos/source/swift/swift-container-server/build b/docker/centos/source/swift/swift-container-server/build
new file mode 120000
index 0000000000..ec19138031
--- /dev/null
+++ b/docker/centos/source/swift/swift-container-server/build
@@ -0,0 +1 @@
+../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/swift/swift-container-server/config-external.sh b/docker/centos/source/swift/swift-container-server/config-external.sh
new file mode 120000
index 0000000000..8fa814ca71
--- /dev/null
+++ b/docker/centos/source/swift/swift-container-server/config-external.sh
@@ -0,0 +1 @@
+../../../../../docker/common/swift/swift-container-server/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/source/swift/swift-container-server/config-internal.sh b/docker/centos/source/swift/swift-container-server/config-internal.sh
new file mode 120000
index 0000000000..3b3c7fcdf1
--- /dev/null
+++ b/docker/centos/source/swift/swift-container-server/config-internal.sh
@@ -0,0 +1 @@
+../../../../../docker/common/swift/swift-container-server/config-internal.sh
\ No newline at end of file
diff --git a/docker/centos/source/swift/swift-container-server/start.sh b/docker/centos/source/swift/swift-container-server/start.sh
new file mode 120000
index 0000000000..b7d3cd9fc1
--- /dev/null
+++ b/docker/centos/source/swift/swift-container-server/start.sh
@@ -0,0 +1 @@
+../../../../../docker/common/swift/swift-container-server/start.sh
\ No newline at end of file
diff --git a/docker/centos/source/swift/swift-data/Dockerfile b/docker/centos/source/swift/swift-data/Dockerfile
new file mode 100644
index 0000000000..ab675045c8
--- /dev/null
+++ b/docker/centos/source/swift/swift-data/Dockerfile
@@ -0,0 +1,13 @@
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
+
+# NOTE(pbourke): This is emulating the Swift "all-in-one" setups where there are 3 disks/partitions
+# on which to mirror data.  This is extremely inefficient and is really only to prove everything
+# works in an AIO setup. For production deploys the Ansible provisioned setup should be used.
+VOLUME [ "/srv/node/sdb1" ]
+VOLUME [ "/srv/node/sdb2" ]
+VOLUME [ "/srv/node/sdb3" ]
+
+# Command needed to start the data container.
+# Note: data containers do not need to be persistent.
+CMD ["/bin/true"]
diff --git a/docker/centos/source/swift/swift-data/build b/docker/centos/source/swift/swift-data/build
new file mode 120000
index 0000000000..ec19138031
--- /dev/null
+++ b/docker/centos/source/swift/swift-data/build
@@ -0,0 +1 @@
+../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/swift/swift-object-auditor/Dockerfile b/docker/centos/source/swift/swift-object-auditor/Dockerfile
new file mode 100644
index 0000000000..9cbbd53c0e
--- /dev/null
+++ b/docker/centos/source/swift/swift-object-auditor/Dockerfile
@@ -0,0 +1,7 @@
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-object-base:%%KOLLA_TAG%%
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
+
+COPY start.sh /
+COPY config-internal.sh config-external.sh /opt/kolla/
+
+CMD ["/start.sh"]
diff --git a/docker/centos/source/swift/swift-object-auditor/build b/docker/centos/source/swift/swift-object-auditor/build
new file mode 120000
index 0000000000..ec19138031
--- /dev/null
+++ b/docker/centos/source/swift/swift-object-auditor/build
@@ -0,0 +1 @@
+../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/swift/swift-object-auditor/config-external.sh b/docker/centos/source/swift/swift-object-auditor/config-external.sh
new file mode 120000
index 0000000000..1adf26bcb3
--- /dev/null
+++ b/docker/centos/source/swift/swift-object-auditor/config-external.sh
@@ -0,0 +1 @@
+../../../../../docker/common/swift/swift-object-auditor/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/source/swift/swift-object-auditor/config-internal.sh b/docker/centos/source/swift/swift-object-auditor/config-internal.sh
new file mode 120000
index 0000000000..e3802f38d6
--- /dev/null
+++ b/docker/centos/source/swift/swift-object-auditor/config-internal.sh
@@ -0,0 +1 @@
+../../../../../docker/common/swift/swift-object-auditor/config-internal.sh
\ No newline at end of file
diff --git a/docker/centos/source/swift/swift-object-auditor/start.sh b/docker/centos/source/swift/swift-object-auditor/start.sh
new file mode 120000
index 0000000000..5ef3165595
--- /dev/null
+++ b/docker/centos/source/swift/swift-object-auditor/start.sh
@@ -0,0 +1 @@
+../../../../../docker/common/swift/swift-object-auditor/start.sh
\ No newline at end of file
diff --git a/docker/centos/source/swift/swift-object-base/Dockerfile b/docker/centos/source/swift/swift-object-base/Dockerfile
new file mode 100644
index 0000000000..600d9d6511
--- /dev/null
+++ b/docker/centos/source/swift/swift-object-base/Dockerfile
@@ -0,0 +1,4 @@
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-base:%%KOLLA_TAG%%
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
+
+COPY config-swift-object.sh /opt/kolla/
diff --git a/docker/centos/source/swift/swift-object-base/build b/docker/centos/source/swift/swift-object-base/build
new file mode 120000
index 0000000000..ec19138031
--- /dev/null
+++ b/docker/centos/source/swift/swift-object-base/build
@@ -0,0 +1 @@
+../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/swift/swift-object-base/config-swift-object.sh b/docker/centos/source/swift/swift-object-base/config-swift-object.sh
new file mode 120000
index 0000000000..a289b4d0de
--- /dev/null
+++ b/docker/centos/source/swift/swift-object-base/config-swift-object.sh
@@ -0,0 +1 @@
+../../../../../docker/common/swift/swift-object-base/config-swift-object.sh
\ No newline at end of file
diff --git a/docker/centos/source/swift/swift-object-expirer/Dockerfile b/docker/centos/source/swift/swift-object-expirer/Dockerfile
new file mode 100644
index 0000000000..9cbbd53c0e
--- /dev/null
+++ b/docker/centos/source/swift/swift-object-expirer/Dockerfile
@@ -0,0 +1,7 @@
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-object-base:%%KOLLA_TAG%%
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
+
+COPY start.sh /
+COPY config-internal.sh config-external.sh /opt/kolla/
+
+CMD ["/start.sh"]
diff --git a/docker/centos/source/swift/swift-object-expirer/build b/docker/centos/source/swift/swift-object-expirer/build
new file mode 120000
index 0000000000..ec19138031
--- /dev/null
+++ b/docker/centos/source/swift/swift-object-expirer/build
@@ -0,0 +1 @@
+../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/swift/swift-object-expirer/config-external.sh b/docker/centos/source/swift/swift-object-expirer/config-external.sh
new file mode 120000
index 0000000000..7f8d3e37e6
--- /dev/null
+++ b/docker/centos/source/swift/swift-object-expirer/config-external.sh
@@ -0,0 +1 @@
+../../../../../docker/common/swift/swift-object-expirer/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/source/swift/swift-object-expirer/config-internal.sh b/docker/centos/source/swift/swift-object-expirer/config-internal.sh
new file mode 120000
index 0000000000..ebd7f0f3e8
--- /dev/null
+++ b/docker/centos/source/swift/swift-object-expirer/config-internal.sh
@@ -0,0 +1 @@
+../../../../../docker/common/swift/swift-object-expirer/config-internal.sh
\ No newline at end of file
diff --git a/docker/centos/source/swift/swift-object-expirer/start.sh b/docker/centos/source/swift/swift-object-expirer/start.sh
new file mode 120000
index 0000000000..3b9a9c3ee9
--- /dev/null
+++ b/docker/centos/source/swift/swift-object-expirer/start.sh
@@ -0,0 +1 @@
+../../../../../docker/common/swift/swift-object-expirer/start.sh
\ No newline at end of file
diff --git a/docker/centos/source/swift/swift-object-replicator/Dockerfile b/docker/centos/source/swift/swift-object-replicator/Dockerfile
new file mode 100644
index 0000000000..9cbbd53c0e
--- /dev/null
+++ b/docker/centos/source/swift/swift-object-replicator/Dockerfile
@@ -0,0 +1,7 @@
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-object-base:%%KOLLA_TAG%%
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
+
+COPY start.sh /
+COPY config-internal.sh config-external.sh /opt/kolla/
+
+CMD ["/start.sh"]
diff --git a/docker/centos/source/swift/swift-object-replicator/build b/docker/centos/source/swift/swift-object-replicator/build
new file mode 120000
index 0000000000..ec19138031
--- /dev/null
+++ b/docker/centos/source/swift/swift-object-replicator/build
@@ -0,0 +1 @@
+../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/swift/swift-object-replicator/config-external.sh b/docker/centos/source/swift/swift-object-replicator/config-external.sh
new file mode 120000
index 0000000000..69e793df4a
--- /dev/null
+++ b/docker/centos/source/swift/swift-object-replicator/config-external.sh
@@ -0,0 +1 @@
+../../../../../docker/common/swift/swift-object-replicator/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/source/swift/swift-object-replicator/config-internal.sh b/docker/centos/source/swift/swift-object-replicator/config-internal.sh
new file mode 120000
index 0000000000..f2a7e134ea
--- /dev/null
+++ b/docker/centos/source/swift/swift-object-replicator/config-internal.sh
@@ -0,0 +1 @@
+../../../../../docker/common/swift/swift-object-replicator/config-internal.sh
\ No newline at end of file
diff --git a/docker/centos/source/swift/swift-object-replicator/start.sh b/docker/centos/source/swift/swift-object-replicator/start.sh
new file mode 120000
index 0000000000..da27b63123
--- /dev/null
+++ b/docker/centos/source/swift/swift-object-replicator/start.sh
@@ -0,0 +1 @@
+../../../../../docker/common/swift/swift-object-replicator/start.sh
\ No newline at end of file
diff --git a/docker/centos/source/swift/swift-object-server/Dockerfile b/docker/centos/source/swift/swift-object-server/Dockerfile
new file mode 100644
index 0000000000..9cbbd53c0e
--- /dev/null
+++ b/docker/centos/source/swift/swift-object-server/Dockerfile
@@ -0,0 +1,7 @@
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-object-base:%%KOLLA_TAG%%
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
+
+COPY start.sh /
+COPY config-internal.sh config-external.sh /opt/kolla/
+
+CMD ["/start.sh"]
diff --git a/docker/centos/source/swift/swift-object-server/build b/docker/centos/source/swift/swift-object-server/build
new file mode 120000
index 0000000000..ec19138031
--- /dev/null
+++ b/docker/centos/source/swift/swift-object-server/build
@@ -0,0 +1 @@
+../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/swift/swift-object-server/config-external.sh b/docker/centos/source/swift/swift-object-server/config-external.sh
new file mode 120000
index 0000000000..a9213fffa1
--- /dev/null
+++ b/docker/centos/source/swift/swift-object-server/config-external.sh
@@ -0,0 +1 @@
+../../../../../docker/common/swift/swift-object-server/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/source/swift/swift-object-server/config-internal.sh b/docker/centos/source/swift/swift-object-server/config-internal.sh
new file mode 120000
index 0000000000..24821e4d2d
--- /dev/null
+++ b/docker/centos/source/swift/swift-object-server/config-internal.sh
@@ -0,0 +1 @@
+../../../../../docker/common/swift/swift-object-server/config-internal.sh
\ No newline at end of file
diff --git a/docker/centos/source/swift/swift-object-server/start.sh b/docker/centos/source/swift/swift-object-server/start.sh
new file mode 120000
index 0000000000..7e47f8018f
--- /dev/null
+++ b/docker/centos/source/swift/swift-object-server/start.sh
@@ -0,0 +1 @@
+../../../../../docker/common/swift/swift-object-server/start.sh
\ No newline at end of file
diff --git a/docker/centos/source/swift/swift-object-updater/Dockerfile b/docker/centos/source/swift/swift-object-updater/Dockerfile
new file mode 100644
index 0000000000..9cbbd53c0e
--- /dev/null
+++ b/docker/centos/source/swift/swift-object-updater/Dockerfile
@@ -0,0 +1,7 @@
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-object-base:%%KOLLA_TAG%%
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
+
+COPY start.sh /
+COPY config-internal.sh config-external.sh /opt/kolla/
+
+CMD ["/start.sh"]
diff --git a/docker/centos/source/swift/swift-object-updater/build b/docker/centos/source/swift/swift-object-updater/build
new file mode 120000
index 0000000000..ec19138031
--- /dev/null
+++ b/docker/centos/source/swift/swift-object-updater/build
@@ -0,0 +1 @@
+../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/swift/swift-object-updater/config-external.sh b/docker/centos/source/swift/swift-object-updater/config-external.sh
new file mode 120000
index 0000000000..94ba9e60c6
--- /dev/null
+++ b/docker/centos/source/swift/swift-object-updater/config-external.sh
@@ -0,0 +1 @@
+../../../../../docker/common/swift/swift-object-updater/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/source/swift/swift-object-updater/config-internal.sh b/docker/centos/source/swift/swift-object-updater/config-internal.sh
new file mode 120000
index 0000000000..fb1e9bdff3
--- /dev/null
+++ b/docker/centos/source/swift/swift-object-updater/config-internal.sh
@@ -0,0 +1 @@
+../../../../../docker/common/swift/swift-object-updater/config-internal.sh
\ No newline at end of file
diff --git a/docker/centos/source/swift/swift-object-updater/start.sh b/docker/centos/source/swift/swift-object-updater/start.sh
new file mode 120000
index 0000000000..2e78e5c095
--- /dev/null
+++ b/docker/centos/source/swift/swift-object-updater/start.sh
@@ -0,0 +1 @@
+../../../../../docker/common/swift/swift-object-updater/start.sh
\ No newline at end of file
diff --git a/docker/centos/source/swift/swift-proxy-server/Dockerfile b/docker/centos/source/swift/swift-proxy-server/Dockerfile
new file mode 100644
index 0000000000..737ae80e07
--- /dev/null
+++ b/docker/centos/source/swift/swift-proxy-server/Dockerfile
@@ -0,0 +1,8 @@
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-base:%%KOLLA_TAG%%
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
+
+
+COPY ./start.sh /start.sh
+COPY config-internal.sh config-external.sh /opt/kolla/
+
+CMD ["/start.sh"]
diff --git a/docker/centos/source/swift/swift-proxy-server/build b/docker/centos/source/swift/swift-proxy-server/build
new file mode 120000
index 0000000000..ec19138031
--- /dev/null
+++ b/docker/centos/source/swift/swift-proxy-server/build
@@ -0,0 +1 @@
+../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/swift/swift-proxy-server/config-external.sh b/docker/centos/source/swift/swift-proxy-server/config-external.sh
new file mode 120000
index 0000000000..178516af5f
--- /dev/null
+++ b/docker/centos/source/swift/swift-proxy-server/config-external.sh
@@ -0,0 +1 @@
+../../../../../docker/common/swift/swift-proxy-server/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/source/swift/swift-proxy-server/config-internal.sh b/docker/centos/source/swift/swift-proxy-server/config-internal.sh
new file mode 120000
index 0000000000..a33b6be4f4
--- /dev/null
+++ b/docker/centos/source/swift/swift-proxy-server/config-internal.sh
@@ -0,0 +1 @@
+../../../../../docker/common/swift/swift-proxy-server/config-internal.sh
\ No newline at end of file
diff --git a/docker/centos/source/swift/swift-proxy-server/start.sh b/docker/centos/source/swift/swift-proxy-server/start.sh
new file mode 120000
index 0000000000..63d0ec91af
--- /dev/null
+++ b/docker/centos/source/swift/swift-proxy-server/start.sh
@@ -0,0 +1 @@
+../../../../../docker/common/swift/swift-proxy-server/start.sh
\ No newline at end of file