diff --git a/Dockerfile.tokenizer-api b/Dockerfile
similarity index 100%
rename from Dockerfile.tokenizer-api
rename to Dockerfile
diff --git a/Dockerfile.serving-api b/Dockerfile.serving-api
deleted file mode 100644
index 9feb90b..0000000
--- a/Dockerfile.serving-api
+++ /dev/null
@@ -1,13 +0,0 @@
-FROM tensorflow/serving
-
-ENV KMP_AFFINITY=noverbose
-ENV TF_CPP_MIN_LOG_LEVEL=3
-
-WORKDIR /models
-COPY ./sqli_model /models/sqli_model
-COPY ./models.config /models/models.config
-
-EXPOSE 8500
-EXPOSE 8501
-
-CMD ["--model_config_file=/models/models.config"]
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 56fc11c..f178821 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -1,26 +1,11 @@
 services:
-  tokenizer-api:
+  prediction-api:
     build:
       context: .
-      dockerfile: Dockerfile.tokenizer-api
-    image: tokenizer-api:latest
+      dockerfile: Dockerfile
+    image: prediction-api:latest
     ports:
       - "8000:8000"
-  serving-api:
-    # build:
-    #   context: .
-    #   dockerfile: Dockerfile.serving-api
-    # image: serving-api:latest
-    # This is a temporary solution to run the serving-api,
-    # until the serving-api is ready to be run in a container.
-    image: tensorflow/serving:latest
-    environment:
-      - MODEL_NAME=sqli_model
-    volumes:
-      - ./sqli_model:/models/sqli_model
-    ports:
-      - "8500:8500"
-      - "8501:8501"
   postgres1:
     image: postgres:latest
     environment:
diff --git a/models.config b/models.config
deleted file mode 100644
index 94a2aaa..0000000
--- a/models.config
+++ /dev/null
@@ -1,8 +0,0 @@
-model_config_list {
-  config {
-    name: 'sqli_model'
-    base_path: '/models/sqli_model'
-    model_platform: "tensorflow"
-    model_version_policy: {all{}}
-  }
-}