diff --git a/build-tools/build-docker-images/README b/build-tools/build-docker-images/README
new file mode 100644
index 00000000..4acacbf6
--- /dev/null
+++ b/build-tools/build-docker-images/README
@@ -0,0 +1,34 @@
+## Example commands for building StarlingX images
+
+PRIVATE_REGISTRY_USERID=myuser
+PRIVATE_REGISTRY=xxx.xxx.xxx.xxx
+
+## Step 1: Build stx-centos
+time $MY_REPO/build-tools/build-docker-images/build-stx-base.sh \
+    --version 2018.11.13 \
+    --user ${PRIVATE_REGISTRY_USERID} --registry ${PRIVATE_REGISTRY}:9001 \
+    --push \
+    --repo stx-local-build,http://${HOSTNAME}:8088/localdisk/loadbuild/jenkins/StarlingX_Upstream_build/2018-11-13_20-18-00/std/rpmbuild/RPMS \
+    --repo stx-mirror-distro,http://${HOSTNAME}:8088/localdisk/designer/jenkins/StarlingX_upstream/cgcs-root/cgcs-centos-repo/Binary \
+    --clean
+
+
+## Step 2: Build wheels (output as tarball)
+time $MY_REPO/build-tools/build-wheels/build-wheel-tarball.sh \
+    --os centos \
+    --release pike
+
+## Step 3: Build images
+time $MY_REPO/build-tools/build-docker-images/build-stx-images.sh \
+    --os centos \
+    --base ${PRIVATE_REGISTRY}:9001/${PRIVATE_REGISTRY_USERID}/stx-centos:2018.11.13 \
+    --wheels http://${HOSTNAME}:8088/$MY_WORKSPACE/std/build-wheels-centos-pike/stx-centos-pike-wheels.tar \
+    --user ${PRIVATE_REGISTRY_USERID} --registry ${PRIVATE_REGISTRY}:9001 \
+    --push --latest \
+    --clean
+
+
+## Note: You may need to add an iptables rule to allow the docker
+## containers to access the http server on your host. For example:
+iptables -I INPUT 6 -i docker0 -p tcp --dport 8088 -m state --state NEW,ESTABLISHED -j ACCEPT
+
diff --git a/build-tools/build-docker-images/build-stx-base.sh b/build-tools/build-docker-images/build-stx-base.sh
new file mode 100755
index 00000000..5d0f815d
--- /dev/null
+++ b/build-tools/build-docker-images/build-stx-base.sh
@@ -0,0 +1,232 @@
+#!/bin/bash
+#
+# Copyright (c) 2018 Wind River Systems, Inc.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# This utility builds the StarlingX wheel tarball
+#
+
+MY_SCRIPT_DIR=$(dirname $(readlink -f $0))
+
+# Required env vars
+if [ -z "${MY_WORKSPACE}" -o -z "${MY_REPO}" ]; then
+    echo "Environment not setup for builds" >&2
+    exit 1
+fi
+
+SUPPORTED_OS_ARGS=('centos')
+OS=centos
+OS_VERSION=7.5.1804
+IMAGE_VERSION=
+PUSH=no
+DOCKER_USER=${USER}
+DOCKER_REGISTRY=
+declare -a REPO_LIST
+REPO_OPTS=
+LOCAL=no
+CLEAN=no
+
+function usage {
+    cat >&2 <<EOF
+Usage:
+$(basename $0)
+
+Options:
+    --os:         Specify base OS (valid options: ${SUPPORTED_OS_ARGS[@]})
+    --os-version: Specify OS version
+    --version:    Specify version for output image
+    --repo:       Software repository (Format: name,baseurl), can be specified multiple times
+    --local:      Use local build for software repository (cannot be used with --repo)
+    --push:       Push to docker repo
+    --user:       Docker repo userid
+    --registry:   Docker registry
+    --clean:      Remove image(s) from local registry
+
+EOF
+}
+
+OPTS=$(getopt -o h -l help,os:,os-version:,version:,repo:,push,user:,registry:,local,clean -- "$@")
+if [ $? -ne 0 ]; then
+    usage
+    exit 1
+fi
+
+eval set -- "${OPTS}"
+
+while true; do
+    case $1 in
+        --)
+            # End of getopt arguments
+            shift
+            break
+            ;;
+        --os)
+            OS=$2
+            shift 2
+            ;;
+        --os-version)
+            OS_VERSION=$2
+            shift 2
+            ;;
+        --version)
+            IMAGE_VERSION=$2
+            shift 2
+            ;;
+        --repo)
+            REPO_LIST+=($2)
+            shift 2
+            ;;
+        --local)
+            LOCAL=yes
+            shift
+            ;;
+        --push)
+            PUSH=yes
+            shift
+            ;;
+        --user)
+            DOCKER_USER=$2
+            shift 2
+            ;;
+        --registry)
+            # Add a trailing / if needed
+            DOCKER_REGISTRY="${2%/}/"
+            shift 2
+            ;;
+        --clean)
+            CLEAN=yes
+            shift
+            ;;
+        -h | --help )
+            usage
+            exit 1
+            ;;
+        *)
+            usage
+            exit 1
+            ;;
+    esac
+done
+
+# Validate the OS option
+VALID_OS=1
+for supported_os in ${SUPPORTED_OS_ARGS[@]}; do
+    if [ "$OS" = "${supported_os}" ]; then
+        VALID_OS=0
+        break
+    fi
+done
+if [ ${VALID_OS} -ne 0 ]; then
+    echo "Unsupported OS specified: ${OS}" >&2
+    echo "Supported OS options: ${SUPPORTED_OS_ARGS[@]}" >&2
+    exit 1
+fi
+
+if [ -z "${IMAGE_VERSION}" ]; then
+    IMAGE_VERSION=${OS_VERSION}
+fi
+
+if [ ${#REPO_LIST[@]} -eq 0 ]; then
+    # Either --repo or --local must be specified
+    if [ "${LOCAL}" = "yes" ]; then
+        REPO_LIST+=("local-std,http://${HOSTNAME}:8088${MY_WORKSPACE}/std/rpmbuild/RPMS")
+        REPO_LIST+=("stx-distro,http://${HOSTNAME}:8088${MY_REPO}/cgcs-centos-repo/Binary")
+    else
+        echo "Either --local or --repo must be specified" >&2
+        exit 1
+    fi
+else
+    if [ "${LOCAL}" = "yes" ]; then
+        echo "Cannot specify both --local and --repo" >&2
+        exit 1
+    fi
+fi
+
+BUILDDIR=${MY_WORKSPACE}/std/build-images/stx-${OS}
+if [ -d ${BUILDDIR} ]; then
+    # Leftover from previous build
+    rm -rf ${BUILDDIR}
+fi
+
+mkdir -p ${BUILDDIR}
+if [ $? -ne 0 ]; then
+    echo "Failed to create ${BUILDDIR}" >&2
+    exit 1
+fi
+
+# Get the Dockerfile
+SRC_DOCKERFILE=${MY_SCRIPT_DIR}/stx-${OS}/Dockerfile
+cp ${SRC_DOCKERFILE} ${BUILDDIR}
+
+# Generate the stx.repo file
+STX_REPO_FILE=${BUILDDIR}/stx.repo
+for repo in ${REPO_LIST[@]}; do
+    repo_name=$(echo $repo | awk -F, '{print $1}')
+    repo_baseurl=$(echo $repo | awk -F, '{print $2}')
+
+    if [ -z "${repo_name}" -o -z "${repo_baseurl}" ]; then
+        echo "Invalid repo specified: ${repo}" >&2
+        echo "Expected format: name,baseurl" >&2
+        exit 1
+    fi
+
+    cat >>${STX_REPO_FILE} <<EOF
+[${repo_name}]
+name=${repo_name}
+baseurl=${repo_baseurl}
+enabled=1
+gpgcheck=0
+skip_if_unavailable=1
+metadata_expire=0
+
+EOF
+
+    REPO_OPTS="${REPO_OPTS} --enablerepo=${repo_name}"
+done
+
+# Check to see if the OS image is already pulled
+docker images --format '{{.Repository}}:{{.Tag}}' ${OS}:${OS_VERSION} | grep -q "^${OS}:${OS_VERSION}$"
+BASE_IMAGE_PRESENT=$?
+
+# Build the image
+IMAGE_NAME=${DOCKER_REGISTRY}${DOCKER_USER}/stx-${OS}:${IMAGE_VERSION}
+
+docker build \
+    --build-arg RELEASE=${OS_VERSION} \
+    --build-arg REPO_OPTS="${REPO_OPTS}" \
+    --tag ${IMAGE_NAME} ${BUILDDIR}
+if [ $? -ne 0 ]; then
+    echo "Failed running docker build command" >&2
+    exit 1
+fi
+
+if [ "${PUSH}" = "yes" ]; then
+    # Push the image
+    echo "Pushing image: ${IMAGE_NAME}"
+    docker push ${IMAGE_NAME}
+    if [ $? -ne 0 ]; then
+        echo "Failed running docker push command" >&2
+        exit 1
+    fi
+fi
+
+if [ "${CLEAN}" = "yes" ]; then
+    # Delete the images
+    echo "Deleting image: ${IMAGE_NAME}"
+    docker image rm ${IMAGE_NAME}
+    if [ $? -ne 0 ]; then
+        echo "Failed running docker image rm command" >&2
+        exit 1
+    fi
+
+    if [ ${BASE_IMAGE_PRESENT} -ne 0 ]; then
+        # The base image was not already present, so delete it
+        echo "Removing docker image ${OS}:${OS_VERSION}"
+        docker image rm ${OS}:${OS_VERSION}
+        if [ $? -ne 0 ]; then
+            echo "Failed to delete base image from docker" >&2
+        fi
+    fi
+fi
+
diff --git a/build-tools/build-docker-images/build-stx-images.sh b/build-tools/build-docker-images/build-stx-images.sh
new file mode 100755
index 00000000..085c5d77
--- /dev/null
+++ b/build-tools/build-docker-images/build-stx-images.sh
@@ -0,0 +1,530 @@
+#!/bin/bash
+#
+# Copyright (c) 2018 Wind River Systems, Inc.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# This utility builds the StarlingX wheel tarball
+#
+
+MY_SCRIPT_DIR=$(dirname $(readlink -f $0))
+
+# Required env vars
+if [ -z "${MY_WORKSPACE}" -o -z "${MY_REPO}" ]; then
+    echo "Environment not setup for builds" >&2
+    exit 1
+fi
+
+source ${MY_REPO}/build-tools/git-utils.sh
+
+SUPPORTED_OS_ARGS=('centos')
+OS=centos
+OPENSTACK_RELEASE=pike
+IMAGE_VERSION=$(date --utc '+%Y.%m.%d.%H.%M') # Default version, using timestamp
+RELEASE=dev
+PUSH=no
+DOCKER_USER=${USER}
+DOCKER_REGISTRY=
+BASE=
+WHEELS=
+CLEAN=no
+declare -a ONLY
+declare -a SKIP
+
+function usage {
+    cat >&2 <<EOF
+Usage:
+$(basename $0)
+
+Options:
+    --os:         Specify base OS (valid options: ${SUPPORTED_OS_ARGS[@]})
+    --version:    Specify version for output image
+    --release:    Openstack release (default: pike)
+    --base:       Specify base docker image (required option)
+    --wheels:     Specify path to wheels tarball or image, URL or docker tag (required option)
+    --push:       Push to docker repo
+    --user:       Docker repo userid
+    --registry:   Docker registry
+    --clean:      Remove image(s) from local registry
+    --only <image> : Only build the specified image(s). Multiple images
+                     can be specified with a comma-separated list, or with
+                     multiple --only arguments.
+    --skip <image> : Skip building the specified image(s). Multiple images
+                     can be specified with a comma-separated list, or with
+                     multiple --skip arguments.
+
+
+EOF
+}
+
+function is_in {
+    local search=$1
+    shift
+
+    for v in $*; do
+        if [ "${search}" = "${v}" ]; then
+            return 0
+        fi
+    done
+    return 1
+}
+
+function is_empty {
+    test $# -eq 0
+}
+
+function get_loci {
+    # Use a specific HEAD of loci, to provide a stable builder
+    local LOCI_REF="d0ef425ef6ce19ce79d93bf3a2be1b464750e2f8"
+
+    ORIGWD=${PWD}
+
+    if [ ! -d ${WORKDIR}/loci ]; then
+        cd ${WORKDIR}
+        git clone --recursive https://github.com/openstack/loci.git
+        if [ $? -ne 0 ]; then
+            echo "Failed to clone loci. Aborting..." >&2
+            return 1
+        fi
+
+        cd loci
+        git checkout ${LOCI_REF}
+        if [ $? -ne 0 ]; then
+            echo "Failed to checkout loci base ref: ${LOCI_REF}" >&2
+            echo "Aborting..." >&2
+            return 1
+        fi
+    else
+        cd ${WORKDIR}/loci
+        local cur_head
+        cur_head=$(git rev-parse HEAD)
+
+        if [ "${cur_head}" != "${LOCI_REF}" ]; then
+            git fetch
+            if [ $? -ne 0 ]; then
+                echo "Failed to fetch loci. Aborting..." >&2
+                return 1
+            fi
+
+            git checkout ${LOCI_REF}
+            if [ $? -ne 0 ]; then
+                echo "Failed to checkout loci base ref: ${LOCI_REF}" >&2
+                echo "Aborting..." >&2
+                return 1
+            fi
+        fi
+    fi
+
+    cd ${ORIGPWD}
+
+    return 0
+}
+
+function build_image_loci {
+    local image_build_file=$1
+
+    # Get the supported args
+    #
+    # To avoid polluting the environment and impacting
+    # other builds, we're going to explicitly grab specific
+    # variables from the directives file. While this does
+    # mean the file is sourced repeatedly, it ensures we
+    # don't get junk.
+    local LABEL
+    LABEL=$(source ${image_build_file} && echo ${LABEL})
+    local PROJECT
+    PROJECT=$(source ${image_build_file} && echo ${PROJECT})
+    local PROJECT_REPO
+    PROJECT_REPO=$(source ${image_build_file} && echo ${PROJECT_REPO})
+    local PROJECT_REF
+    PROJECT_REF=$(source ${image_build_file} && echo ${PROJECT_REF})
+    local PIP_PACKAGES
+    PIP_PACKAGES=$(source ${image_build_file} && echo ${PIP_PACKAGES})
+    local DIST_PACKAGES
+    DIST_PACKAGES=$(source ${image_build_file} && echo ${DIST_PACKAGES})
+    local PROFILES
+    PROFILES=$(source ${image_build_file} && echo ${PROFILES})
+    local CUSTOMIZATION
+    CUSTOMIZATION=$(source ${image_build_file} && echo ${CUSTOMIZATION})
+
+    if is_in ${PROJECT} ${SKIP[@]} || is_in ${LABEL} ${SKIP[@]}; then
+        echo "Skipping ${LABEL}"
+        return 0
+    fi
+
+    if ! is_empty ${ONLY[@]} && ! is_in ${PROJECT} ${ONLY[@]} && ! is_in ${LABEL} ${ONLY[@]}; then
+        echo "Skipping ${LABEL}"
+        return 0
+    fi
+
+    echo "Building ${LABEL}"
+
+    local -a BUILD_ARGS=
+    BUILD_ARGS=(--build-arg PROJECT=${PROJECT})
+    BUILD_ARGS+=(--build-arg PROJECT_REPO=${PROJECT_REPO})
+    BUILD_ARGS+=(--build-arg FROM=${BASE})
+    BUILD_ARGS+=(--build-arg WHEELS=${WHEELS})
+
+    if [ -n "${PROJECT_REF}" ]; then
+        BUILD_ARGS+=(--build-arg PROJECT_REF=${PROJECT_REF})
+    fi
+
+    if [ -n "${PIP_PACKAGES}" ]; then
+        BUILD_ARGS+=(--build-arg PIP_PACKAGES="${PIP_PACKAGES}")
+    fi
+
+    if [ -n "${DIST_PACKAGES}" ]; then
+        BUILD_ARGS+=(--build-arg DIST_PACKAGES="${DIST_PACKAGES}")
+    fi
+
+    if [ -n "${PROFILES}" ]; then
+        BUILD_ARGS+=(--build-arg PROFILES="${PROFILES}")
+    fi
+
+    local build_image_name="${USER}/${LABEL}:${IMAGE_TAG_BUILD}"
+
+    docker build ${WORKDIR}/loci --no-cache \
+        "${BUILD_ARGS[@]}" \
+        --tag ${build_image_name}  2>&1 | tee ${WORKDIR}/docker-${LABEL}.log
+    if [ ${PIPESTATUS[0]} -ne 0 ]; then
+        echo "Failed to build ${LABEL}... Aborting"
+        RESULTS_FAILED+=(${LABEL})
+        return 1
+    fi
+
+    if [ ${OS} = "centos" ]; then
+        # For images with apache, we need a workaround for paths
+        echo "${PROFILES}" | grep -q apache
+        if [ $? -eq 0 ]; then
+            docker run --name ${USER}_update_img ${build_image_name} bash -c '\
+                ln -s /var/log/httpd /var/log/apache2 && \
+                ln -s /var/run/httpd /var/run/apache2 && \
+                ln -s /etc/httpd /etc/apache2 && \
+                ln -s /etc/httpd/conf.d /etc/apache2/conf-enabled && \
+                ln -s /etc/httpd/conf.modules.d /etc/apache2/mods-available && \
+                ln -s /usr/sbin/httpd /usr/sbin/apache2 && \
+                ln -s /etc/httpd/conf.d /etc/apache2/sites-enabled \
+            '
+            if [ $? -ne 0 ]; then
+                echo "Failed to add apache workaround for ${LABEL}... Aborting"
+                RESULTS_FAILED+=(${LABEL})
+                docker rm ${USER}_update_img
+                return 1
+            fi
+
+            docker commit --change='CMD ["bash"]' ${USER}_update_img ${build_image_name}
+            if [ $? -ne 0 ]; then
+                echo "Failed to commit apache workaround for ${LABEL}... Aborting"
+                RESULTS_FAILED+=(${LABEL})
+                docker rm ${USER}_update_img
+                return 1
+            fi
+
+            docker rm ${USER}_update_img
+        fi
+    fi
+
+    if [ -n "${CUSTOMIZATION}" ]; then
+        docker run --name ${USER}_update_img ${build_image_name} bash -c "${CUSTOMIZATION}"
+        if [ $? -ne 0 ]; then
+            echo "Failed to add customization for ${LABEL}... Aborting"
+            RESULTS_FAILED+=(${LABEL})
+            docker rm ${USER}_update_img
+            return 1
+        fi
+
+        docker commit --change='CMD ["bash"]' ${USER}_update_img ${build_image_name}
+        if [ $? -ne 0 ]; then
+            echo "Failed to commit customization for ${LABEL}... Aborting"
+            RESULTS_FAILED+=(${LABEL})
+            docker rm ${USER}_update_img
+            return 1
+        fi
+
+        docker rm ${USER}_update_img
+    fi
+
+    RESULTS_BUILT+=(${build_image_name})
+
+    if [ "${PUSH}" = "yes" ]; then
+        local push_tag="${DOCKER_REGISTRY}${DOCKER_USER}/${LABEL}:${IMAGE_TAG}"
+        docker tag ${build_image_name} ${push_tag}
+        docker push ${push_tag}
+        RESULTS_PUSHED+=(${push_tag})
+
+        if [ "$TAG_LATEST" = "yes" ]; then
+            local latest_tag="${DOCKER_REGISTRY}${DOCKER_USER}/${LABEL}:${IMAGE_TAG_LATEST}"
+            docker tag ${push_tag} ${latest_tag}
+            docker push ${latest_tag}
+            RESULTS_PUSHED+=(${latest_tag})
+        fi
+    fi
+}
+
+function build_image_docker {
+    local image_build_file=$1
+
+    # Get the supported args
+    #
+    local LABEL
+    LABEL=$(source ${image_build_file} && echo ${LABEL})
+
+    if is_in ${PROJECT} ${SKIP[@]} || is_in ${LABEL} ${SKIP[@]}; then
+        echo "Skipping ${LABEL}"
+        return 0
+    fi
+
+    if ! is_empty ${ONLY[@]} && ! is_in ${PROJECT} ${ONLY[@]} && ! is_in ${LABEL} ${ONLY[@]}; then
+        echo "Skipping ${LABEL}"
+        return 0
+    fi
+
+    echo "Building ${LABEL}"
+
+    local docker_src
+    docker_src=$(dirname ${image_build_file})/docker
+
+    # Check for a Dockerfile
+    if [ ! -f ${docker_src}/Dockerfile ]; then
+        echo "${docker_src}/Dockerfile not found" >&2
+        RESULTS_FAILED+=(${LABEL})
+        return 1
+    fi
+
+    # Possible design option: Make a copy of the docker_src dir in BUILDDIR
+
+    local build_image_name="${USER}/${LABEL}:${IMAGE_TAG_BUILD}"
+
+    docker build ${docker_src} --no-cache \
+        --build-arg "BASE=${BASE}" \
+        --tag ${build_image_name} 2>&1 | tee ${WORKDIR}/docker-${LABEL}.log
+    if [ ${PIPESTATUS[0]} -ne 0 ]; then
+        echo "Failed to build ${LABEL}... Aborting"
+        RESULTS_FAILED+=(${LABEL})
+        return 1
+    fi
+
+    RESULTS_BUILT+=(${build_image_name})
+
+    if [ "${PUSH}" = "yes" ]; then
+        local push_tag="${DOCKER_REGISTRY}${DOCKER_USER}/${LABEL}:${IMAGE_TAG}"
+        docker tag ${build_image_name} ${push_tag}
+        docker push ${push_tag}
+        RESULTS_PUSHED+=(${push_tag})
+
+        if [ "$TAG_LATEST" = "yes" ]; then
+            local latest_tag="${DOCKER_REGISTRY}${DOCKER_USER}/${LABEL}:${IMAGE_TAG_LATEST}"
+            docker tag ${push_tag} ${latest_tag}
+            docker push ${latest_tag}
+            RESULTS_PUSHED+=(${latest_tag})
+        fi
+    fi
+}
+
+function build_image {
+    local image_build_file=$1
+
+    # Get the builder
+    local BUILDER
+    BUILDER=$(source ${image_build_file} && echo ${BUILDER})
+
+    case ${BUILDER} in
+        loci)
+            build_image_loci ${image_build_file}
+            return $?
+            ;;
+        docker)
+            build_image_docker ${image_build_file}
+            return $?
+            ;;
+        *)
+            echo "Unsupported BUILDER in ${image_build_file}: ${BUILDER}" >&2
+            return 1
+            ;;
+    esac
+}
+
+OPTS=$(getopt -o h -l help,os:,version:,release:,push,user:,registry:,release:,base:,wheels:,only:,skip:,latest,clean -- "$@")
+if [ $? -ne 0 ]; then
+    usage
+    exit 1
+fi
+
+eval set -- "${OPTS}"
+
+while true; do
+    case $1 in
+        --)
+            # End of getopt arguments
+            shift
+            break
+            ;;
+        --base)
+            BASE=$2
+            shift 2
+            ;;
+        --os)
+            OS=$2
+            shift 2
+            ;;
+        --wheels)
+            WHEELS=$2
+            shift 2
+            ;;
+        --version)
+            IMAGE_VERSION=$2
+            shift 2
+            ;;
+        --release)
+            OPENSTACK_RELEASE=$2
+            shift 2
+            ;;
+        --push)
+            PUSH=yes
+            shift
+            ;;
+        --user)
+            DOCKER_USER=$2
+            shift 2
+            ;;
+        --registry)
+            # Add a trailing / if needed
+            DOCKER_REGISTRY="${2%/}/"
+            shift 2
+            ;;
+        --clean)
+            CLEAN=yes
+            shift
+            ;;
+        --only)
+            # Read comma-separated values into array
+            ONLY+=(${2//,/ })
+            shift 2
+            ;;
+        --skip)
+            # Read comma-separated values into array
+            SKIP+=(${2//,/ })
+            shift 2
+            ;;
+        --latest)
+            TAG_LATEST=yes
+            shift
+            ;;
+        -h | --help )
+            usage
+            exit 1
+            ;;
+        *)
+            usage
+            exit 1
+            ;;
+    esac
+done
+
+# Validate the OS option
+VALID_OS=1
+for supported_os in ${SUPPORTED_OS_ARGS[@]}; do
+    if [ "$OS" = "${supported_os}" ]; then
+        VALID_OS=0
+        break
+    fi
+done
+if [ ${VALID_OS} -ne 0 ]; then
+    echo "Unsupported OS specified: ${OS}" >&2
+    echo "Supported OS options: ${SUPPORTED_OS_ARGS[@]}" >&2
+    exit 1
+fi
+
+if [ -z "${WHEELS}" ]; then
+    echo "Path to wheels tarball must be specified with --wheels option." >&2
+    exit 1
+fi
+
+if [ -z "${BASE}" ]; then
+    echo "Base image must be specified with --base option." >&2
+    exit 1
+fi
+
+IMAGE_TAG_BUILD="${RELEASE}-${OS}-${OPENSTACK_RELEASE}-build"
+IMAGE_TAG="${RELEASE}-${OS}-${OPENSTACK_RELEASE}-${IMAGE_VERSION}"
+IMAGE_TAG_LATEST="${RELEASE}-${OS}-${OPENSTACK_RELEASE}-latest"
+
+WORKDIR=${MY_WORKSPACE}/std/build-images
+mkdir -p ${WORKDIR}
+if [ $? -ne 0 ]; then
+    echo "Failed to create ${WORKDIR}" >&2
+    exit 1
+fi
+
+# Check to see if the BASE image is already pulled
+docker images --format '{{.Repository}}:{{.Tag}}' ${BASE} | grep -q "^${BASE}$"
+BASE_IMAGE_PRESENT=$?
+
+# Download loci, if needed.
+get_loci
+if [ $? -ne 0 ]; then
+    # Error is reported by the function already
+    exit 1
+fi
+
+# Find the directives files
+for image_build_inc_file in $(find ${GIT_LIST} -maxdepth 1 -name "${OS}_${OPENSTACK_RELEASE}_docker_images.inc"); do
+    basedir=$(dirname ${image_build_inc_file})
+    for image_build_dir in $(sed -e 's/#.*//' ${image_build_inc_file} | sort -u); do
+        for image_build_file in ${basedir}/${image_build_dir}/${OS}/*.${OPENSTACK_RELEASE}_docker_image; do
+            # Failures are reported by the build functions
+            build_image ${image_build_file}
+        done
+    done
+done
+
+if [ "${CLEAN}" = "yes" ]; then
+    # Delete the images
+    echo "Deleting images"
+    docker image rm ${RESULTS_BUILT[@]} ${RESULTS_PUSHED[@]}
+    if [ $? -ne 0 ]; then
+        # We don't want to fail the overall build for this, so just log it
+        echo "Failed to clean up images" >&2
+    fi
+
+    if [ ${BASE_IMAGE_PRESENT} -ne 0 ]; then
+        # The base image was not already present, so delete it
+        echo "Removing docker image ${BASE}"
+        docker image rm ${BASE}
+        if [ $? -ne 0 ]; then
+            echo "Failed to delete base image from docker" >&2
+        fi
+    fi
+fi
+
+RC=0
+if [ ${#RESULTS_BUILT[@]} -gt 0 ]; then
+    echo "#######################################"
+    echo
+    echo "The following images were built:"
+    for i in ${RESULTS_BUILT[@]}; do
+        echo $i
+    done | sort
+
+    if [ ${#RESULTS_PUSHED[@]} -gt 0 ]; then
+        echo
+        echo "The following tags were pushed:"
+        for i in ${RESULTS_PUSHED[@]}; do
+            echo $i
+        done | sort
+    fi
+fi
+
+if [ ${#RESULTS_FAILED[@]} -gt 0 ]; then
+    echo
+    echo "#######################################"
+    echo
+    echo "There were ${#RESULTS_FAILED[@]} failures:"
+    for i in ${RESULTS_FAILED[@]}; do
+        echo $i
+    done | sort
+    RC=1
+fi
+
+exit ${RC}
+
diff --git a/build-tools/build-docker-images/stx-centos/Dockerfile b/build-tools/build-docker-images/stx-centos/Dockerfile
new file mode 100644
index 00000000..926cf2be
--- /dev/null
+++ b/build-tools/build-docker-images/stx-centos/Dockerfile
@@ -0,0 +1,24 @@
+# Expected build arguments:
+#   RELEASE: centos release
+#   REPO_OPTS: yum options to enable StarlingX repo
+#
+ARG RELEASE=7.5.1804
+FROM centos:${RELEASE}
+
+ARG REPO_OPTS
+
+# The stx.repo file must be generated by the build tool first
+COPY stx.repo /
+
+RUN set -ex ;\
+    mv /stx.repo /etc/yum.repos.d/ ;\
+    yum upgrade --disablerepo=* ${REPO_OPTS} -y ;\
+    yum install --disablerepo=* ${REPO_OPTS} -y \
+        qemu-img \
+        openssh-clients \
+        ;\
+    rm -rf \
+        /var/log/* \
+        /tmp/* \
+        /var/tmp/*
+