diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4876f13..8fc5490 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,3 @@
-image: shockrah/freechat:0.3
-
 stages:
   - build
   - test
@@ -8,16 +6,17 @@ variables:
   CARGO_HOME: $CI_PROJECT_DIR/.cargo
 
 
-before_script:
-  - export PATH="$CARGO_HOME/bin:$PATH"
-
 
 build-json-api:
-  # Literally so expensive that I realy just don't wanna deal with it
+  image: rust:slim-buster
+
   stage: build
   when: manual
   only:  [ "master" ]
 
+  before_script:
+    - apt-get install default-libmysqlclient-dev  # required to build/test mysql
+
   script:
     - cd json-api/
     - cargo build --release
@@ -32,10 +31,15 @@ build-json-api:
 
 
 test-json-api:
+  image: rust:slim-buster
+
   stage: test
   needs: 
     - build-json-api
 
+  before_script:
+    - apt-get install default-libmysqlclient-dev  # required to build/test mysql
+
   script:
     - cd json-api/
     - cargo test --release