diff --git a/core2.Dockerfile b/core2.Dockerfile
deleted file mode 100644
index e36b46fb..00000000
--- a/core2.Dockerfile
+++ /dev/null
@@ -1,148 +0,0 @@
-FROM phusion/baseimage
-
-# Env variables
-ENV DEBIAN_FRONTEND noninteractive
-
-#Install dependencies and required requisites
-RUN apt-get update -y \
-  && apt-get install -y \
-    software-properties-common \
-  && add-apt-repository -y ppa:ubuntugis/ppa \
-  && add-apt-repository -y ppa:george-edison55/cmake-3.x \
-  && apt-get update -y
-
-# All packages (Will install much faster)
-RUN apt-get install --no-install-recommends -y \
-  build-essential \
-  cmake \
-  gdal-bin \
-  git \
-  libatlas-base-dev \
-  libavcodec-dev \
-  libavformat-dev \
-  libboost-date-time-dev \
-  libboost-filesystem-dev \
-  libboost-iostreams-dev \
-  libboost-log-dev \
-  libboost-python-dev \
-  libboost-regex-dev \
-  libboost-thread-dev \
-  libeigen3-dev \
-  libflann-dev \
-  libgdal-dev \
-  libgeotiff-dev \
-  libgoogle-glog-dev \
-  libgtk2.0-dev \
-  libjasper-dev \
-  libjpeg-dev \
-  libjsoncpp-dev \
-  liblapack-dev \
-  liblas-bin \
-  libpng-dev \
-  libproj-dev \
-  libsuitesparse-dev \
-  libswscale-dev \
-  libtbb2 \
-  libtbb-dev \
-  libtiff-dev \
-  libvtk6-dev \
-  libxext-dev \
-  python-dev \
-  python-empy \
-  python-gdal \
-  python-matplotlib \
-  python-networkx \
-  python-nose \
-  python-pip \
-  python-pyproj \
-  python-pyside \
-  python-software-properties \
-  python-wheel \
-  swig2.0
-
-RUN apt-get remove libdc1394-22-dev
-RUN pip install --upgrade pip
-RUN pip install setuptools
-RUN pip install -U \
-  appsettings \
-  catkin-pkg \
-  exifread \
-  gpxpy \
-  loky \
-  numpy==1.15.4 \
-  psutil \
-  pyproj \
-  PyYAML \
-  repoze.lru \
-  scipy \
-  shapely \
-  xmltodict \
-  https://github.com/OpenDroneMap/gippy/archive/numpyfix.zip
-
-ENV PYTHONPATH="$PYTHONPATH:/code/SuperBuild/install/lib/python2.7/dist-packages"
-ENV PYTHONPATH="$PYTHONPATH:/code/SuperBuild/src/opensfm"
-ENV LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/code/SuperBuild/install/lib"
-
-# Prepare directories
-RUN mkdir /code
-WORKDIR /code
-
-# Copy repository files
-COPY CMakeLists.txt /code/CMakeLists.txt
-COPY configure.sh /code/configure.sh
-COPY /modules/ /code/modules/
-COPY /opendm/ /code/opendm/
-COPY /patched_files/ /code/patched_files/
-COPY run.py /code/run.py
-COPY run.sh /code/run.sh
-COPY /scripts/ /code/scripts/
-COPY /SuperBuild/cmake/ /code/SuperBuild/cmake/
-COPY /SuperBuild/CMakeLists.txt /code/SuperBuild/CMakeLists.txt
-COPY docker.settings.yaml /code/settings.yaml
-COPY VERSION /code/VERSION
-
-# Replace g++ and gcc with our own scripts
-COPY /docker/ /code/docker/
-RUN mv -v /usr/bin/gcc /usr/bin/gcc_real \
-  && mv -v /usr/bin/g++ /usr/bin/g++_real \
-  && cp -v /code/docker/gcc /usr/bin/gcc \
-  && cp -v /code/docker/g++ /usr/bin/g++
-
-# Compile code in SuperBuild and root directories
-RUN cd SuperBuild \
-  && mkdir build \
-  && cd build \
-  && cmake .. \
-  && make -j$(nproc) \
-  && cd ../.. \
-  && mkdir build \
-  && cd build \
-  && cmake .. \
-  && make -j$(nproc)
-
-RUN apt-get -y remove \
-  git \
-  build-essential \
-  cmake \
-  libgl1-mesa-dri \
-  python-pip
-
-RUN apt-get install -y libvtk6-dev
-
-# Cleanup APT
-RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* 
-
-# Clean Superbuild
-RUN rm -rf \
-  /code/SuperBuild/build/opencv \
-  /code/SuperBuild/download \
-  /code/SuperBuild/src/ceres \
-  /code/SuperBuild/src/mvstexturing \
-  /code/SuperBuild/src/opencv \
-  /code/SuperBuild/src/opengv \
-  /code/SuperBuild/src/pcl \
-  /code/SuperBuild/src/pdal
-
-# Entry point
-ENTRYPOINT ["python", "/code/run.py", "code"]
-
diff --git a/docker/README b/docker/README
index f96e85d8..6843dac5 100644
--- a/docker/README
+++ b/docker/README
@@ -1,3 +1,3 @@
-The g++ and gcc scripts in this directory are used to replace the real g++ and gcc programs so that compilation across all projects (including dependencies) uses the -march=core2 flag, which allows us to build a docker image compatible with most Intel based CPUs.
+The g++ and gcc scripts in this directory are used to replace the real g++ and gcc programs so that compilation across all projects (including dependencies) uses the -march=nehalem flag, which allows us to build a docker image compatible with most Intel based CPUs.
 
-Without the -march=core2 flag, a docker image will contain binaries that are optimized for the machine that built the image, and will not run on older machines.
+Without the -march=nehalem flag, a docker image will contain binaries that are optimized for the machine that built the image, and will not run on older machines.
diff --git a/docker/g++ b/docker/g++
index 0206851b..ffdb9a14 100755
--- a/docker/g++
+++ b/docker/g++
@@ -9,4 +9,4 @@ do
     fi
 done
 
-/usr/bin/g++_real -march=core2 $args
+/usr/bin/g++_real -march=nehalem $args
diff --git a/docker/gcc b/docker/gcc
index d72824c6..c2d09701 100755
--- a/docker/gcc
+++ b/docker/gcc
@@ -9,4 +9,4 @@ do
     fi
 done
 
-/usr/bin/gcc_real -march=core2 $args
+/usr/bin/gcc_real -march=nehalem $args