diff --git a/.github/workflows/deploy_push.yml b/.github/workflows/deploy_push.yml
index cdc1e804..45db91a3 100644
--- a/.github/workflows/deploy_push.yml
+++ b/.github/workflows/deploy_push.yml
@@ -99,15 +99,17 @@ jobs:
       - name: Build python lambda layer
         id: build
         run: |
-          cd make_lamnda_layer
+          cd infra/make_lamda_layer
           chmod +x runner.sh
           ./runner.sh
 
+
       - name: Terraform Plan
         id: plan
         run: |
           cd infra
           tfcmt plan -- terraform plan -no-color
+
       - name: Terraform Plan Status
         if: steps.plan.outcome == 'failure'
         run: exit 1
diff --git a/infra/api/test_liveness_mtchoun-mouh.py b/infra/api/test_liveness_mtchoun-mouh.py
index b2e6238f..49a90e50 100644
--- a/infra/api/test_liveness_mtchoun-mouh.py
+++ b/infra/api/test_liveness_mtchoun-mouh.py
@@ -14,7 +14,7 @@ def setup_method(self, method):
     chrome_options.add_argument('--headless')
     chrome_options.add_argument('--no-sandbox')
     chrome_options.add_argument('--disable-dev-shm-usage')
-    self.driver = webdriver.Chrome(chrome_options=chrome_options)
+    self.driver = webdriver.Chrome(options=chrome_options)
     self.vars = {}
   
   def teardown_method(self, method):
diff --git a/infra/main.tf b/infra/main.tf
index e465dd93..3479e7e6 100644
--- a/infra/main.tf
+++ b/infra/main.tf
@@ -140,49 +140,7 @@ resource "aws_lambda_permission" "apigw_lambda" {
   # More: http://docs.aws.amazon.com/apigateway/latest/developerguide/api-gateway-control-access-using-iam-policies-to-invoke-api.html
   source_arn = "arn:aws:execute-api:${var.region}:${data.aws_caller_identity.current.account_id}:${aws_api_gateway_rest_api.api.id}/*/${aws_api_gateway_method.method.http_method}${aws_api_gateway_resource.resource.path}"
 }
-# ======================================> HERE
-
-# # create zip file from requirements.txt. Triggers only when the file is updated
-# resource "null_resource" "lambda_layer" {
-#   triggers = {
-#     requirements = filesha1(local.requirements_path)
-#   }
-#   # the command to install python and dependencies to the machine and zips
-#   provisioner "local-exec" {
-#     command = <<EOT
-#       set -e
-#       apt-get update
-#       apt install python3 python3-pip zip -y
-#       rm -rf python
-#       mkdir python
-#       pip3 install -r ${local.requirements_path} -t python/
-#       zip -r ${local.layer_zip_path} python/
-#     EOT
-#   }
-# }
-
 
-# # create zip file from requirements.txt. Triggers only when the file is updated
-resource "null_resource" "lambda_layer" {
-  # triggers = {
-  #   requirements = filesha1(local.requirements_path)
-  # }
-  # the command to install python and dependencies to the machine and zips
-  provisioner "local-exec" {
-    command = <<EOT
-        /bin/bash
-
-        pip install virtualenv &&\
-        virtualenv --python=/usr/bin/python3.8 python &&\
-        . python/bin/activate &&\
-        pip install -r api/requirements.txt -t python/lib/python3.8/site-packages &&\
-        ls python &&\
-        wget https://mongulu-files.s3.eu-central-1.amazonaws.com/7zz && chmod u+x 7zz &&\
-        ./7zz a python.zip python/ &&\
-        ./7zz l python.zip
-    EOT
-  }
-}
 # Archive a single file.
 
 # data "archive_file" "test_zip" {
@@ -193,7 +151,7 @@ resource "null_resource" "lambda_layer" {
 # }
 
 resource "aws_lambda_layer_version" "test_lambda_layer" {
-  filename            = "python.zip"
+  filename            = "make_lamda_layer/python.zip"
   layer_name          = "test_lambda_layer"
   compatible_runtimes = ["python3.8", "python3.7"]
 }
diff --git a/infra/make_lamda_layer/Dockerfile b/infra/make_lamda_layer/Dockerfile
new file mode 100644
index 00000000..93b8b657
--- /dev/null
+++ b/infra/make_lamda_layer/Dockerfile
@@ -0,0 +1,10 @@
+FROM amazonlinux:2018.03
+RUN ulimit -n 1024 && yum -y update && yum -y install \
+    python38 \
+    python38-pip \
+    python38-devel \
+    zip \
+    && yum clean all
+
+RUN python3 -m pip install pip==22.1.2
+RUN python3 -m pip install virtualenv==20.14.1
\ No newline at end of file
diff --git a/infra/make_lamda_layer/docker_install.sh b/infra/make_lamda_layer/docker_install.sh
new file mode 100644
index 00000000..ef854569
--- /dev/null
+++ b/infra/make_lamda_layer/docker_install.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+set -ex
+virtualenv --python=/usr/bin/python3.8 python
+source /python/bin/activate
+pip install -r requirements.txt -t /python/lib/python3.8/site-packages
+zip -r9 python.zip python
\ No newline at end of file
diff --git a/infra/make_lamda_layer/requirements.txt b/infra/make_lamda_layer/requirements.txt
new file mode 120000
index 00000000..e1746dbc
--- /dev/null
+++ b/infra/make_lamda_layer/requirements.txt
@@ -0,0 +1 @@
+../api/requirements.txt
\ No newline at end of file
diff --git a/infra/make_lamda_layer/runner.sh b/infra/make_lamda_layer/runner.sh
new file mode 100755
index 00000000..ad9b054b
--- /dev/null
+++ b/infra/make_lamda_layer/runner.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+set -ex
+container_name=lambda_docker
+docker_image=aws_lambda_builder_image
+
+docker build --tag $docker_image .
+
+docker run -td --name=$container_name $docker_image
+docker cp ../api/requirements.txt $container_name:/requirements.txt
+
+docker exec -i $container_name /bin/bash < ./docker_install.sh
+docker cp $container_name:/python.zip python.zip
+docker stop $container_name
+docker rm $container_name
\ No newline at end of file