diff --git a/Dockerfile b/Dockerfile
index b2db1640..65fc7b8e 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -73,17 +73,6 @@ RUN apt-get -qy --no-install-recommends install \
   && ln -s /opt/firefox/firefox /usr/bin/firefox \
   && rm -f /tmp/firefox-esr.tar.bz2
 
-#======================================
-# Install Geckodriver / Firefox Driver
-#======================================
-RUN export BASE_URL=https://github.com/mozilla/geckodriver/releases/download \
-  && export VERSION=$(curl -sL \
-    https://api.github.com/repos/mozilla/geckodriver/releases/latest | \
-    grep tag_name | cut -d '"' -f 4) \
-  && curl -sL \
-  $BASE_URL/$VERSION/geckodriver-$VERSION-linux64.tar.gz | tar -xz \
-&& mv geckodriver /usr/local/bin/geckodriver
-
 #===================
 # Install PhantomJS
 #===================
@@ -107,12 +96,12 @@ RUN exec "$@"
 #=====================
 COPY seleniumbase /SeleniumBase/seleniumbase/
 COPY examples /SeleniumBase/examples/
-COPY docker_requirements.txt /SeleniumBase/docker_requirements.txt
-COPY server_setup.py /SeleniumBase/server_setup.py
+COPY requirements.txt /SeleniumBase/requirements.txt
+COPY setup.py /SeleniumBase/setup.py
 RUN pip install --upgrade pip
 RUN pip install --upgrade setuptools
-RUN cd /SeleniumBase && ls && pip install -r docker_requirements.txt
-RUN cd /SeleniumBase && python server_setup.py install
+RUN cd /SeleniumBase && ls && pip install -r requirements.txt
+RUN cd /SeleniumBase && python setup.py install
 
 #==========================================
 # Create entrypoint and grab example tests
diff --git a/docker_requirements.txt b/docker_requirements.txt
deleted file mode 100755
index 186a2c5c..00000000
--- a/docker_requirements.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-pip>=9.0.1
-setuptools>=34.3.1
-selenium==2.53.6
-nose>=1.3.7
-pytest>=3.0.6
-six>=1.10.0
-flake8==3.3.0
-requests==2.13.0
-urllib3==1.20
-BeautifulSoup==3.2.1
-unittest2==1.1.0
-chardet==2.3.0
-boto==2.46.1
-ipdb==0.10.2
-pyvirtualdisplay==0.2.1