diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6684a0f8451307864569d36e3725123c4e7aef58..9a61d1a11b5ec35cb871cbe77070db498fd1bf47 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,22 +1,33 @@
 image: ubuntu:latest
 
+
+.install_firefox_geckodriver: &install_firefox_geckodriver
+
+
 before_script:
   - apt-get update -y
   - apt install -y python3-pip python3.10 python-is-python3
-  - apt install -y xvfb libssl-dev firefox openssl wget
+  - apt install -y xvfb libssl-dev openssl wget
   - openssl req -new -x509 -keyout server.pem -out server.pem -days 365 -nodes -batch
-  - pip install -r requirements.txt
 #  -  sudo -H pip3 install bpython selenium
 
-#   - export DISPLAY=:2
-#  - Xvfb $DISPLAY -ac &
-#  - apt install firefox-geckodriver
-  - export GECKO_DRIVER_VERSION='v0.31.0'
-  - wget https://github.com/mozilla/geckodriver/releases/download/$GECKO_DRIVER_VERSION/geckodriver-$GECKO_DRIVER_VERSION-linux64.tar.gz
-  - tar -xvzf geckodriver-$GECKO_DRIVER_VERSION-linux64.tar.gz
-  - rm geckodriver-$GECKO_DRIVER_VERSION-linux64.tar.gz
-  - chmod +x geckodriver
-  - cp geckodriver /usr/local/bin/
+  - apt-get update # && apt-get upgrade --assume-yes
+  - apt-get install gconf-service libasound2 libatk1.0-0 libc6 libcairo2 libcups2 libdbus-1-3 libexpat1 libfontconfig1 libgcc1 libgconf-2-4 libgdk-pixbuf2.0-0 libglib2.0-0 libgtk-3-0 libnspr4 libpango-1.0-0 libpangocairo-1.0-0 libstdc++6 libx11-6 libx11-xcb1 libxcb1 libxcomposite1 libxcursor1 libxdamage1 libxext6 libxfixes3 libxi6 libxrandr2 libxrender1 libxss1 libxtst6 ca-certificates fonts-liberation libappindicator1 libnss3 lsb-release xdg-utils --assume-yes
+  - wget -nv -O ~/FirefoxSetup.tar.bz2 "https://download.mozilla.org/?product=firefox-latest&os=linux64"
+  - tar xjf ~/FirefoxSetup.tar.bz2 -C /opt/
+  - ln -s /opt/firefox/firefox /usr/lib/firefox
+  - export PATH=$PATH:/opt/firefox/
+  - wget -nv -O ~/geckodriver.tar.gz "https://github.com/mozilla/geckodriver/releases/download/v0.28.0/geckodriver-v0.28.0-linux64.tar.gz"
+  - tar -zxvf ~/geckodriver.tar.gz -C /opt/
+  - export PATH=$PATH:/opt/
+  - pip install -r requirements.txt
+
+  #  - export GECKO_DRIVER_VERSION='v0.31.0'
+#  - wget https://github.com/mozilla/geckodriver/releases/download/$GECKO_DRIVER_VERSION/geckodriver-$GECKO_DRIVER_VERSION-linux64.tar.gz
+#  - tar -xvzf geckodriver-$GECKO_DRIVER_VERSION-linux64.tar.gz
+#  - rm geckodriver-$GECKO_DRIVER_VERSION-linux64.tar.gz
+#  - chmod +x geckodriver
+#  - cp geckodriver /usr/local/bin/
 
   # - 'command -v ssh-agent >/dev/null || ( apt-get update -y && apt-get install openssh-client -y )'
   ##