diff --git a/ci/gitlab-test-lists/.gitlab-ci.grayskull_e150_perf_bfp8_b_nightly.yml b/ci/gitlab-test-lists/.gitlab-ci.grayskull_e150_perf_bfp8_b_nightly.yml
deleted file mode 100644
index 69532948..00000000
--- a/ci/gitlab-test-lists/.gitlab-ci.grayskull_e150_perf_bfp8_b_nightly.yml
+++ /dev/null
@@ -1,154 +0,0 @@
-.pybuda-backend-silicon-gs-e150-perf-bfp8_b:
-  extends: .backend-gs-common
-  stage: perf-gs-e150-bfp8_b
-  rules:
-    - if: ($CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_MESSAGE =~ /\[perf_gs_e150_bfp8_b\]/)
-    - if: ($CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_MESSAGE =~ /\[no_ci_perf_gs_e150_bfp8_b\]/)
-    - if: ($CI_COMMIT_REF_NAME == "main" && $CI_JOB_DESCRIPTION == "pybuda-nightly")
-  timeout: 60m
-  variables:
-    PYTEST_CURRENT_TEST: $CI_JOB_NAME
-  tags:
-    - gs-1-card
-    - e150
-    - performance
-  script:
-    - !reference [.common_prep, script]
-    - !reference [.lib_gl_package, script]
-  artifacts:
-    paths:
-      - /builds/tenstorrent/pybuda/*-perf.json
-      - "*netlist.yaml"
-  after_script:
-    - ci/upload-perf-test.py -b gitlab-pipeline-$CI_PIPELINE_ID --job_name $CI_JOB_NAME
-    # Move netlist(s) to root so that they'll be in root of artifacts - this runs before artifacts are saved
-    - mv pytest_ci_out/$CI_JOB_NAME/*netlist.yaml ./
-  
-# tenstorrent/pybuda#2190
-pybuda-silicon-gs-e150-perf-resnet-bfp8_b:
-  extends: .pybuda-backend-silicon-gs-e150-perf-bfp8_b
-  script:
-    - !reference [.pybuda-backend-silicon-gs-e150-perf-bfp8_b, script]
-    - pybuda/test/benchmark/benchmark.py -m resnet -c resnet50 -o $CI_JOB_NAME-perf.json
-
-# tenstorrent/pybuda#2185
-pybuda-silicon-gs-e150-perf-mobilenet-v1-bfp8_b:
-  extends: .pybuda-backend-silicon-gs-e150-perf-bfp8_b
-  script:
-    - !reference [.pybuda-backend-silicon-gs-e150-perf-bfp8_b, script]
-    - pybuda/test/benchmark/benchmark.py -m mobilenet_v2 -c 224 -o $CI_JOB_NAME-perf.json
-
-# tenstorrent/pybuda#2186
-pybuda-silicon-gs-e150-perf-mobilenet-v2-bfp_8:
-  extends: .pybuda-backend-silicon-gs-e150-perf-bfp8_b
-  script:
-    - !reference [.pybuda-backend-silicon-gs-e150-perf-bfp8_b, script]
-    - pybuda/test/benchmark/benchmark.py -m mobilenet_v2 -c 224 -mf HiFi2 -o $CI_JOB_NAME-perf.json
-
-# tenstorrent/pybuda#2187
-pybuda-silicon-gs-e150-perf-mobilenet-v3-bfp_8:
-  extends: .pybuda-backend-silicon-gs-e150-perf-bfp8_b
-  script:
-    - !reference [.pybuda-backend-silicon-gs-e150-perf-bfp8_b, script]
-    - pybuda/test/benchmark/benchmark.py -m mobilenet_v3_timm -c large -o $CI_JOB_NAME-perf.json
-
-# tenstorrent/pybuda#2193
-pybuda-silicon-gs-e150-perf-vovnet-v2-bfp_8:
-  extends: .pybuda-backend-silicon-gs-e150-perf-bfp8_b
-  script:
-    - !reference [.pybuda-backend-silicon-gs-e150-perf-bfp8_b, script]
-    - pybuda/test/benchmark/benchmark.py -m vovnet_v2 -c 39 -o $CI_JOB_NAME-perf.json
-
-# tenstorrent/pybuda#2188
-pybuda-silicon-gs-e150-perf-openpose-body-bfp_8:
-  extends: .pybuda-backend-silicon-gs-e150-perf-bfp8_b
-  script:
-    - !reference [.pybuda-backend-silicon-gs-e150-perf-bfp8_b, script]
-    - git submodule update --init --checkout --depth 1 -f third_party/confidential_customer_models
-    - pybuda/test/benchmark/benchmark.py -m openpose_osmr_body -c 2d -o $CI_JOB_NAME-perf.json
-
-# tenstorrent/pybuda#2189
-pybuda-silicon-gs-e150-perf-openpose-hand-bfp_8:
-  extends: .pybuda-backend-silicon-gs-e150-perf-bfp8_b
-  script:
-    - !reference [.pybuda-backend-silicon-gs-e150-perf-bfp8_b, script]
-    - git submodule update --init --checkout --depth 1 -f third_party/confidential_customer_models
-    - pybuda/test/benchmark/benchmark.py -m openpose_hand -c basic -o $CI_JOB_NAME-perf.json
-
-# tenstorrent/pybuda#2183
-pybuda-silicon-gs-e150-perf-hrnet-bfp_8:
-  extends: .pybuda-backend-silicon-gs-e150-perf-bfp8_b
-  script:
-    - !reference [.pybuda-backend-silicon-gs-e150-perf-bfp8_b, script]
-    - pybuda/test/benchmark/benchmark.py -m hrnet -c v2_w64 -o $CI_JOB_NAME-perf.json
-
-# tenstorrent/pybuda#2194
-pybuda-silicon-gs-e150-perf-yolo-v3-bfp_8:
-  extends: .pybuda-backend-silicon-gs-e150-perf-bfp8_b
-  script:
-    - !reference [.pybuda-backend-silicon-gs-e150-perf-bfp8_b, script]
-    - git submodule update --init --checkout --depth 1 -f third_party/confidential_customer_models
-    - pybuda/test/benchmark/benchmark.py -m yolo_v3 -c default -mb 32 -o $CI_JOB_NAME-perf.json
-
-# tenstorrent/pybuda#2195
-pybuda-silicon-gs-e150-perf-yolo-v5-bfp_8:
-  extends: .pybuda-backend-silicon-gs-e150-perf-bfp8_b
-  script:
-    - !reference [.pybuda-backend-silicon-gs-e150-perf-bfp8_b, script]
-    - pybuda/test/benchmark/benchmark.py -m yolo_v5 -c s -o $CI_JOB_NAME-perf.json
-
-# tenstorrent/pybuda#2184
-pybuda-silicon-gs-e150-perf-inception-v4-bfp_8:
-  extends: .pybuda-backend-silicon-gs-e150-perf-bfp8_b
-  script:
-    - !reference [.pybuda-backend-silicon-gs-e150-perf-bfp8_b, script]
-    - pybuda/test/benchmark/benchmark.py -m inception_v4 -c 224 -o $CI_JOB_NAME-perf.json
-
-# tenstorrent/pybuda#2191
-pybuda-silicon-gs-e150-perf-unet-bfp_8:
-  extends: .pybuda-backend-silicon-gs-e150-perf-bfp8_b
-  script:
-    - !reference [.pybuda-backend-silicon-gs-e150-perf-bfp8_b, script]
-    - pybuda/test/benchmark/benchmark.py -m unet -c 256 -o $CI_JOB_NAME-perf.json
-
-# tenstorrent/pybuda#2197
-pybuda-silicon-gs-e150-perf-vit-bfp8_b:
-  extends: .pybuda-backend-silicon-gs-e150-perf-bfp8_b
-  script:
-    - !reference [.pybuda-backend-silicon-gs-e150-perf-bfp8_b, script]
-    - pybuda/test/benchmark/benchmark.py -m vit -c base -o $CI_JOB_NAME-perf.json
-
-# tenstorrent/pybuda#2198
-pybuda-silicon-gs-e150-perf-deit-bfp8_b:
-  extends: .pybuda-backend-silicon-gs-e150-perf-bfp8_b
-  script:
-    - !reference [.pybuda-backend-silicon-gs-e150-perf-bfp8_b, script]
-    - pybuda/test/benchmark/benchmark.py -m deit -c base -o $CI_JOB_NAME-perf.json
-
-# tenstorrent/pybuda#2196
-pybuda-silicon-gs-e150-perf-bert-large-bfp8_b:
-  extends: .pybuda-backend-silicon-gs-e150-perf-bfp8_b
-  script:
-    - !reference [.pybuda-backend-silicon-gs-e150-perf-bfp8_b, script]
-    - pybuda/test/benchmark/benchmark.py -m bert -c large_tc -o $CI_JOB_NAME-perf.json
-
-# tenstorrent/pybuda#2199
-pybuda-silicon-gs-e150-perf-whisper-bfp8_b:
-  extends: .pybuda-backend-silicon-gs-e150-perf-bfp8_b
-  script:
-    - !reference [.pybuda-backend-silicon-gs-e150-perf-bfp8_b, script]
-    - pybuda/test/benchmark/benchmark.py -m whisper -c small --loop_count 1 -mb 1 --single-thread --generative -o $CI_JOB_NAME-perf.json
-
-# tenstorrent/pybuda#2201
-pybuda-silicon-gs-e150-perf-t5-large-bfp8_b:
-  extends: .pybuda-backend-silicon-gs-e150-perf-bfp8_b
-  script:
-    - !reference [.pybuda-backend-silicon-gs-e150-perf-bfp8_b, script]
-    - pybuda/test/benchmark/benchmark.py -m t5 -c large --loop_count 1 -mb 1 --single-thread --generative -o $CI_JOB_NAME-perf.json
-
-# tenstorrent/pybuda#2203
-pybuda-silicon-gs-e150-perf-flan-t5-large-bfp8_b:
-  extends: .pybuda-backend-silicon-gs-e150-perf-bfp8_b
-  script:
-    - !reference [.pybuda-backend-silicon-gs-e150-perf-bfp8_b, script]
-    - pybuda/test/benchmark/benchmark.py -m flan_t5 -c large --loop_count 1 -mb 1 -mf HiFi2 --single-thread --generative -o $CI_JOB_NAME-perf.json
diff --git a/ci/gitlab-test-lists/.gitlab-ci.grayskull_e150_perf_fp16_nightly.yml b/ci/gitlab-test-lists/.gitlab-ci.grayskull_e150_perf_fp16_nightly.yml
deleted file mode 100644
index 2a192039..00000000
--- a/ci/gitlab-test-lists/.gitlab-ci.grayskull_e150_perf_fp16_nightly.yml
+++ /dev/null
@@ -1,140 +0,0 @@
-.pybuda-backend-silicon-gs-e150-perf-fp16:
-  extends: .backend-gs-common
-  stage: perf-gs-e150-fp16
-  rules:
-    - if: ($CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_MESSAGE =~ /\[perf\]/)
-    - if: ($CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_MESSAGE =~ /\[perf_gs\]/)
-    - if: ($CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_MESSAGE =~ /\[perf_gs_e150_fp16\]/)
-    - if: ($CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_MESSAGE =~ /\[no_ci_perf\]/)
-    - if: ($CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_MESSAGE =~ /\[no_ci_perf_gs\]/)
-    - if: ($CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_MESSAGE =~ /\[no_ci_perf_gs_e150_fp16\]/)
-    - if: ($CI_COMMIT_REF_NAME == "main" && $CI_JOB_DESCRIPTION == "pybuda-nightly")
-  timeout: 60m
-  variables:
-    PYTEST_CURRENT_TEST: $CI_JOB_NAME
-  tags:
-    - gs-1-card
-    - e150
-    - performance
-  script:
-    - !reference [.common_prep, script]
-    - !reference [.lib_gl_package, script]
-  artifacts:
-    paths:
-      - /builds/tenstorrent/pybuda/*-perf.json
-      - "*netlist.yaml"
-  after_script:
-    - ci/upload-perf-test.py -b gitlab-pipeline-$CI_PIPELINE_ID --job_name $CI_JOB_NAME
-    # Move netlist(s) to root so that they'll be in root of artifacts - this runs before artifacts are saved
-    - mv pytest_ci_out/$CI_JOB_NAME/*netlist.yaml ./
-  
-pybuda-silicon-gs-e150-perf-resnet:
-  extends: .pybuda-backend-silicon-gs-e150-perf-fp16
-  script:
-    - !reference [.pybuda-backend-silicon-gs-e150-perf-fp16, script]
-    - pybuda/test/benchmark/benchmark.py -m resnet -c resnet50 -df Fp16_b -mf HiFi3 -o $CI_JOB_NAME-perf.json
-
-pybuda-silicon-gs-e150-perf-mobilenet-v1:
-  extends: .pybuda-backend-silicon-gs-e150-perf-fp16
-  script:
-    - !reference [.pybuda-backend-silicon-gs-e150-perf-fp16, script]
-    - pybuda/test/benchmark/benchmark.py -m mobilenet_v1 -c 224 -df Fp16_b -mf HiFi2 -o $CI_JOB_NAME-perf.json
-
-pybuda-silicon-gs-e150-perf-mobilenet-v2:
-  extends: .pybuda-backend-silicon-gs-e150-perf-fp16
-  script:
-    - !reference [.pybuda-backend-silicon-gs-e150-perf-fp16, script]
-    - pybuda/test/benchmark/benchmark.py -m mobilenet_v2 -c 224 -df Fp16_b -mf HiFi2 -o $CI_JOB_NAME-perf.json
-
-pybuda-silicon-gs-e150-perf-mobilenet-v3:
-  extends: .pybuda-backend-silicon-gs-e150-perf-fp16
-  script:
-    - !reference [.pybuda-backend-silicon-gs-e150-perf-fp16, script]
-    - pybuda/test/benchmark/benchmark.py -m mobilenet_v3_timm -c large -df Fp16_b -mf HiFi2 -o $CI_JOB_NAME-perf.json
-
-pybuda-silicon-gs-e150-perf-vovnet-v2:
-  extends: .pybuda-backend-silicon-gs-e150-perf-fp16
-  script:
-    - !reference [.pybuda-backend-silicon-gs-e150-perf-fp16, script]
-    - pybuda/test/benchmark/benchmark.py -m vovnet_v2 -c 39 -df Fp16_b -mf HiFi3 -o $CI_JOB_NAME-perf.json
-
-pybuda-silicon-gs-e150-perf-openpose-body:
-  extends: .pybuda-backend-silicon-gs-e150-perf-fp16
-  script:
-    - !reference [.pybuda-backend-silicon-gs-e150-perf-fp16, script]
-    - git submodule update --init --checkout --depth 1 -f third_party/confidential_customer_models
-    - pybuda/test/benchmark/benchmark.py -m openpose_osmr_body -c 2d -df Fp16 -mf HiFi3 -o $CI_JOB_NAME-perf.json
-
-pybuda-silicon-gs-e150-perf-openpose-hand:
-  extends: .pybuda-backend-silicon-gs-e150-perf-fp16
-  script:
-    - !reference [.pybuda-backend-silicon-gs-e150-perf-fp16, script]
-    - git submodule update --init --checkout --depth 1 -f third_party/confidential_customer_models
-    - pybuda/test/benchmark/benchmark.py -m openpose_hand -c basic -df Fp16_b -mf HiFi3 -o $CI_JOB_NAME-perf.json
-
-pybuda-silicon-gs-e150-perf-hrnet:
-  extends: .pybuda-backend-silicon-gs-e150-perf-fp16
-  script:
-    - !reference [.pybuda-backend-silicon-gs-e150-perf-fp16, script]
-    - pybuda/test/benchmark/benchmark.py -m hrnet -c v2_w64 -df Fp16_b -mf HiFi3 -o $CI_JOB_NAME-perf.json
-
-pybuda-silicon-gs-e150-perf-yolo-v3:
-  extends: .pybuda-backend-silicon-gs-e150-perf-fp16
-  script:
-    - !reference [.pybuda-backend-silicon-gs-e150-perf-fp16, script]
-    - git submodule update --init --checkout --depth 1 -f third_party/confidential_customer_models
-    - pybuda/test/benchmark/benchmark.py -m yolo_v3 -c default -mb 32 -df Fp16_b -mf HiFi3 -o $CI_JOB_NAME-perf.json
-
-pybuda-silicon-gs-e150-perf-yolo-v5:
-  extends: .pybuda-backend-silicon-gs-e150-perf-fp16
-  script:
-    - !reference [.pybuda-backend-silicon-gs-e150-perf-fp16, script]
-    - pybuda/test/benchmark/benchmark.py -m yolo_v5 -c s -df Fp16_b -mf HiFi3 -o $CI_JOB_NAME-perf.json
-
-pybuda-silicon-gs-e150-perf-inception-v4:
-  extends: .pybuda-backend-silicon-gs-e150-perf-fp16
-  script:
-    - !reference [.pybuda-backend-silicon-gs-e150-perf-fp16, script]
-    - pybuda/test/benchmark/benchmark.py -m inception_v4 -c 224 -df Fp16_b -mf HiFi3 -o $CI_JOB_NAME-perf.json
-
-pybuda-silicon-gs-e150-perf-unet:
-  extends: .pybuda-backend-silicon-gs-e150-perf-fp16
-  script:
-    - !reference [.pybuda-backend-silicon-gs-e150-perf-fp16, script]
-    - pybuda/test/benchmark/benchmark.py -m unet -c 256 -mb 48 -df Fp16_b -mf HiFi3 -o $CI_JOB_NAME-perf.json
-
-pybuda-silicon-gs-e150-perf-vit:
-  extends: .pybuda-backend-silicon-gs-e150-perf-fp16
-  script:
-    - !reference [.pybuda-backend-silicon-gs-e150-perf-fp16, script]
-    - pybuda/test/benchmark/benchmark.py -m vit -c base -df Fp16_b -mf HiFi2 -o $CI_JOB_NAME-perf.json
-
-pybuda-silicon-gs-e150-perf-deit:
-  extends: .pybuda-backend-silicon-gs-e150-perf-fp16
-  script:
-    - !reference [.pybuda-backend-silicon-gs-e150-perf-fp16, script]
-    - pybuda/test/benchmark/benchmark.py -m deit -c base -df Fp16_b -mf HiFi2 -o $CI_JOB_NAME-perf.json
-
-pybuda-silicon-gs-e150-perf-bert-large:
-  extends: .pybuda-backend-silicon-gs-e150-perf-fp16
-  script:
-    - !reference [.pybuda-backend-silicon-gs-e150-perf-fp16, script]
-    - pybuda/test/benchmark/benchmark.py -m bert -c large_tc -df Fp16_b -mf HiFi3 -o $CI_JOB_NAME-perf.json
-
-pybuda-silicon-gs-e150-perf-whisper:
-  extends: .pybuda-backend-silicon-gs-e150-perf-fp16
-  script:
-    - !reference [.pybuda-backend-silicon-gs-e150-perf-fp16, script]
-    - pybuda/test/benchmark/benchmark.py -m whisper -c small --loop_count 1 -mb 1 -df Fp16_b -mf HiFi3 --single-thread --generative -o $CI_JOB_NAME-perf.json
-
-pybuda-silicon-gs-e150-perf-t5-large:
-  extends: .pybuda-backend-silicon-gs-e150-perf-fp16
-  script:
-    - !reference [.pybuda-backend-silicon-gs-e150-perf-fp16, script]
-    - pybuda/test/benchmark/benchmark.py -m t5 -c large --loop_count 1 -mb 1 -df Fp16_b -mf HiFi3 --single-thread --generative -o $CI_JOB_NAME-perf.json
-
-pybuda-silicon-gs-e150-perf-flan-t5-large:
-  extends: .pybuda-backend-silicon-gs-e150-perf-fp16
-  script:
-    - !reference [.pybuda-backend-silicon-gs-e150-perf-fp16, script]
-    - pybuda/test/benchmark/benchmark.py -m flan_t5 -c large --loop_count 1 -mb 1 -df Fp16_b -mf HiFi3 --single-thread --generative -o $CI_JOB_NAME-perf.json
diff --git a/ci/pipeline-images/ubuntu-20-04-amd64.Dockerfile b/ci/pipeline-images/ubuntu-20-04-amd64.Dockerfile
deleted file mode 100644
index a6aeea59..00000000
--- a/ci/pipeline-images/ubuntu-20-04-amd64.Dockerfile
+++ /dev/null
@@ -1,201 +0,0 @@
-FROM ubuntu:20.04 AS base-ubuntu-20-04-amd64
-
-RUN apt update
-RUN apt install -y --no-install-recommends apt-utils dialog
-
-RUN curl -L https://packages.gitlab.com/install/repositories/runner/gitlab-runner/script.deb.sh | bash
-RUN apt update && DEBIAN_FRONTEND=noninteractive apt install -y gitlab-runner iputils-ping libboost-all-dev sudo awscli zip unzip
-RUN apt update && DEBIAN_FRONTEND=noninteractive apt install -y lldb zsh tmux vim emacs tree git
-
-##################################################
-# Extra Packages
-##################################################
-RUN apt update && apt install -y pciutils kmod python3-pip
-RUN apt update && apt install -y python3.8 python3.8-dev python3.8-venv
-RUN apt update && apt install -y libdpkg-perl
-RUN apt update && apt install -y curl jq
-RUN apt update && apt install -y cmake=3.16.3-1ubuntu1 cmake-data=3.16.3-1ubuntu1
-RUN apt update && apt install -y hwloc nano
-RUN apt update && apt install -y valgrind=1:3.15.0-1ubuntu9
-RUN apt update && apt install -y locales
-
-RUN pip3 install z3-solver==4.8.15
-RUN pip3 install junitparser==2.5.0
-RUN pip3 install elasticsearch==7.16.3
-RUN pip3 install torch==1.13.1 --extra-index-url https://download.pytorch.org/whl/cpu
-
-##################################################
-# DeBuda Packages
-##################################################
-RUN apt update && apt install -y libzmq3-dev
-RUN pip3 install pyzmq tabulate
-
-##################################################
-# Helper utilities - Grendel
-##################################################
-RUN apt update && apt install -y \
-    build-essential \
-    python3.8 \
-    screen \
-    tmux \
-    binutils \
-    automake \
-    build-essential \
-    libboost-dev=1.71.0.0ubuntu2 \
-    wget \
-    gdb=9.2-0ubuntu1~20.04.1 \
-    gfortran \
-    git \
-    g++-9 \
-    vim \
-    emacs \
-    sudo \
- && rm -rf /var/lib/apt/lists/*
-
-##################################################
-# For Grendel perf model
-##################################################
-RUN apt update && apt install -y \
-    libboost-all-dev \
-    libyaml-cpp-dev \
-    rapidjson-dev \
-    libsqlite3-dev \
-    libhdf5-serial-dev \
-    doxygen \
- && rm -rf /var/lib/apt/lists/*
-
-##################################################
-# Sudo
-##################################################
-RUN chmod o+w /etc/sudoers && echo "%linux-admins ALL= ALL" >> /etc/sudoers && chmod o-w /etc/sudoers
-
-##################################################
-# Set up SSH
-##################################################
-RUN apt update && apt install -y openssh-server
-RUN update-rc.d ssh defaults
-RUN echo "X11UseLocalhost no" >> /etc/ssh/sshd_config
-
-##################################################
-# Set up Active Directory
-##################################################
-RUN apt update && DEBIAN_FRONTEND=noninteractive apt install -y realmd policykit-1 libnss-sss libpam-sss adcli packagekit samba chrony krb5-user sssd sssd-tools
-RUN systemctl enable sssd
-
-##################################################
-# Build Environment
-##################################################
-RUN apt update && apt install -y libtbb-dev libcapstone-dev pkg-config
-RUN apt update && apt install -y git make clang-6.0 gcc g++ ruby sudo pciutils gtkwave
-RUN apt update && apt install -y build-essential dpkg-dev fakeroot kmod libalgorithm-diff-perl libalgorithm-diff-xs-perl libalgorithm-merge-perl libfakeroot libfile-fcntllock-perl liblocale-gettext-perl
-
-# Install git-lfs
-RUN wget https://github.com/git-lfs/git-lfs/releases/download/v2.4.2/git-lfs-linux-amd64-2.4.2.tar.gz && tar xzvf git-lfs-linux-amd64-2.4.2.tar.gz && cd git-lfs-2.4.2 && sudo bash ./install.sh
-
-##################################################
-# glog
-##################################################
-RUN apt update && apt install -y libgoogle-glog-dev
-
-##################################################
-# Python
-##################################################
-RUN apt update && apt install -y python3.8 python3.8-dev python3.8-venv python3-pip python3-setuptools python3-wheel
-RUN python3 -m pip install python-gitlab elasticsearch torch
-
-############################################
-#  Rose
-############################################
-RUN apt update && apt install -y software-properties-common
-RUN add-apt-repository ppa:rosecompiler/rose-development
-RUN apt update && apt install -y rose rose-tools
-
-############################################
-# miniconda
-############################################
-RUN wget https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh
-RUN bash miniconda.sh -b -p /opt/miniconda
-RUN rm -f miniconda.sh
-
-############################################
-#  Grayskull Riscv
-############################################
-RUN mkdir -p /opt
-RUN curl "https://yyz-gitlab.local.tenstorrent.com/api/v4/projects/11/packages/generic/riscv32i/2020.11.13/riscv32i-v20201113.tar.gz" --output /opt/riscv32i-v20201113.tar.gz
-RUN tar -xvzf /opt/riscv32i-v20201113.tar.gz -C /opt
-RUN rm /opt/riscv32i-v20201113.tar.gz
-
-# Extract seperate risc toolchain for Tensix team
-RUN curl "https://yyz-gitlab.local.tenstorrent.com/api/v4/projects/11/packages/generic/riscv64iafv/2022.03.17/riscv64iafv.tar.gz" --output /opt/riscv64iafv.tar.gz
-RUN tar -xvzf /opt/riscv64iafv.tar.gz -C /opt
-RUN rm /opt/riscv64iafv.tar.gz
-
-##################################################
-# ccache
-##################################################
-RUN apt install -y ccache=3.7.7-1
-#Across docker runners, we try to share mounted ccache dir
-RUN mkdir -p /runner-ccache
-
-##################################################
-# Set up filesystem
-##################################################
-# Shared home directory and nextstep
-RUN apt update && apt install -y nfs-common cifs-utils
-
-##################################################
-# Set up systemd
-##################################################
-RUN apt install -y --no-install-recommends software-properties-common rsyslog systemd systemd-cron sudo iproute2
-
-##################################################
-# Add new packages here to speed up cached builds - once all builds are versioned caching can be turned on
-##################################################
-# LibGL for YOLO
-RUN apt install -y libgl1-mesa-glx
-# Bazel
-RUN apt install -y openjdk-8-jdk && echo "deb [arch=amd64] http://storage.googleapis.com/bazel-apt stable jdk1.8" | tee /etc/apt/sources.list.d/bazel.list && curl https://bazel.build/bazel-release.pub.gpg | apt-key add - && apt update && apt install -y bazel
-# rsync
-RUN apt install -y rsync
-# bear
-RUN apt install -y bear
-# tqdm
-RUN pip3 install tqdm
-# gmock and gtest
-RUN apt install -y libgtest-dev libgmock-dev
-# perf
-RUN apt update && \
-    apt install -y linux-tools-generic linux-cloud-tools-generic linux-tools-common && \
-    update-alternatives --install /usr/local/bin/perf perf "$(find /usr/lib/linux-tools*/perf | head -1)" 2 && \
-    update-alternatives --install /usr/local/bin/perf perf /usr/bin/perf 1 && \
-    setcap cap_sys_admin,cap_sys_ptrace,cap_syslog=ep "$(readlink -f $(which perf))"
-# clang-format
-RUN wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add - && \
-    add-apt-repository 'deb http://apt.llvm.org/focal/ llvm-toolchain-focal main' && \
-    apt update && \
-    apt install -y clang-format
-# llvm-17
-RUN wget https://apt.llvm.org/llvm.sh -P /tmp \
-    && chmod +x /tmp/llvm.sh && \
-    /tmp/llvm.sh 17
-
-FROM base-ubuntu-20-04-amd64 as pybuda-ubuntu-20-04-amd64
-# Set up Gitlab runner
-ARG LOGIN=tester
-# Add user and grant sudo privileges. Password will be the same as login.
-RUN useradd -m -s /bin/bash -G sudo tester
-RUN echo "tester:tester" | chpasswd
-# Copy a few common files into the image
-RUN chown -R tester:tester /home/tester
-# Change the user that runs the gitlab-runner service to gitlab-runner. This
-# fixes the non-working cancel button in the Gitlab GUI. See the answer
-# provided by Michael Gerber at https://gitlab.com/gitlab-org/gitlab-runner/issues/1662
-RUN sed -i 's/--exec/--user gitlab-runner --exec/g' /etc/init.d/gitlab-runner
-RUN sed -i 's/"--user" "gitlab-runner"//g' /etc/init.d/gitlab-runner
-# The next one prevents the "mesg: ttyname failed: Inappropriate ioctl for device":
-#   (see https://superuser.com/questions/1241548/xubuntu-16-04-ttyname-failed-inappropriate-ioctl-for-device#1253889)
-RUN sed -i 's/mesg n/tty -s \&\& mesg n/g' /root/.profile
-# Setup YYZ isilon home directory
-RUN echo "yyz-isi-01-nfs:/ifs/data/home /home nfs rsize=8192,wsize=8192,timeo=14,intr" >> /etc/fstab
-WORKDIR /home/tester
-CMD ["/bin/bash"]
\ No newline at end of file
diff --git a/ci/pipeline-images/ubuntu-22-04-amd64.Dockerfile b/ci/pipeline-images/ubuntu-22-04-amd64.Dockerfile
deleted file mode 100644
index be382b1a..00000000
--- a/ci/pipeline-images/ubuntu-22-04-amd64.Dockerfile
+++ /dev/null
@@ -1,225 +0,0 @@
-FROM ubuntu:22.04 as base-ubuntu-22-04-amd64
-
-RUN apt update
-RUN apt install -y --no-install-recommends apt-utils dialog curl
-
-RUN apt update && DEBIAN_FRONTEND=noninteractive apt install -y iputils-ping libboost-all-dev sudo awscli zip unzip
-RUN apt update && DEBIAN_FRONTEND=noninteractive apt install -y lldb zsh tmux vim emacs tree git
-
-# Gitlab runner
-RUN curl -L https://packages.gitlab.com/install/repositories/runner/gitlab-runner/script.deb.sh | bash
-RUN apt install -y gitlab-runner
-
-##################################################
-# Extra Packages
-##################################################
-RUN apt update && apt install -y pciutils kmod python3-pip
-RUN apt update && apt install -y python3.10 python3.10-dev python3.10-venv
-RUN apt update && apt install -y libdpkg-perl
-RUN apt update && apt install -y curl jq
-RUN apt update && apt install -y cmake
-RUN apt update && apt install -y hwloc nano
-RUN apt update && apt install -y valgrind
-RUN apt update && apt install -y locales
-
-RUN pip3 install z3-solver==4.8.15
-RUN pip3 install junitparser==2.5.0
-RUN pip3 install elasticsearch==7.16.3
-RUN pip3 install torch==1.11.0 --extra-index-url https://download.pytorch.org/whl/cpu
-
-##################################################
-# DeBuda Packages
-##################################################
-RUN apt update && apt install -y libzmq3-dev
-RUN pip3 install pyzmq tabulate
-
-##################################################
-# Helper utilities - Grendel
-##################################################
-RUN apt update && apt install -y \
-    build-essential \
-    python3.10 \
-    screen \
-    tmux \
-    binutils \
-    automake \
-    build-essential \
-    libboost-dev \
-    wget \
-    gdb \
-    gfortran \
-    git \
-    g++-9 \
-    vim \
-    emacs \
-    sudo \
- && rm -rf /var/lib/apt/lists/*
-
-##################################################
-# For Grendel perf model
-##################################################
-RUN apt update && apt install -y \
-    libboost-all-dev \
-    rapidjson-dev \
-    libsqlite3-dev \
-    libhdf5-serial-dev \
-    doxygen \
- && rm -rf /var/lib/apt/lists/*
-
-##################################################
-# Sudo
-##################################################
-RUN chmod o+w /etc/sudoers && echo "%linux-admins ALL= ALL" >> /etc/sudoers && chmod o-w /etc/sudoers
-
-##################################################
-# Set up SSH
-##################################################
-RUN apt update && apt install -y openssh-server
-RUN update-rc.d ssh defaults
-RUN echo "X11UseLocalhost no" >> /etc/ssh/sshd_config
-
-##################################################
-# Set up Active Directory
-##################################################
-RUN apt update && DEBIAN_FRONTEND=noninteractive apt install -y realmd policykit-1 libnss-sss libpam-sss adcli packagekit samba chrony krb5-user sssd sssd-tools
-RUN systemctl enable sssd
-
-##################################################
-# Build Environment
-##################################################
-RUN apt update && apt install -y libtbb-dev libcapstone-dev pkg-config
-RUN apt update && apt install -y git make clang ruby sudo pciutils gtkwave
-RUN apt update && apt install -y build-essential dpkg-dev fakeroot kmod libalgorithm-diff-perl libalgorithm-diff-xs-perl libalgorithm-merge-perl libfakeroot libfile-fcntllock-perl liblocale-gettext-perl
-
-##################################################
-# Ubuntu 20.04 legacy utils
-##################################################
-RUN apt update && apt install -y g++-9-multilib cpp-9 gcc-9 gcc-11 g++-11 g++-11-multilib
-
-RUN update-alternatives --remove-all c++
-RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-9 100 --slave /usr/bin/g++ g++ /usr/bin/g++-9
-RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-11 50 --slave /usr/bin/g++ g++ /usr/bin/g++-11
-RUN update-alternatives --install /usr/bin/cc cc /usr/bin/gcc 30
-RUN update-alternatives --set cc /usr/bin/gcc
-RUN update-alternatives --install /usr/bin/c++ c++ /usr/bin/g++ 30
-RUN update-alternatives --set c++ /usr/bin/g++
-
-# Install libyaml
-RUN wget http://mirrors.kernel.org/ubuntu/pool/main/y/yaml-cpp/libyaml-cpp-dev_0.6.2-4ubuntu1_amd64.deb
-RUN wget http://mirrors.kernel.org/ubuntu/pool/main/y/yaml-cpp/libyaml-cpp0.6_0.6.2-4ubuntu1_amd64.deb
-RUN dpkg -i libyaml-cpp-dev_0.6.2-4ubuntu1_amd64.deb libyaml-cpp0.6_0.6.2-4ubuntu1_amd64.deb
-RUN rm libyaml-cpp-dev_0.6.2-4ubuntu1_amd64.deb libyaml-cpp0.6_0.6.2-4ubuntu1_amd64.deb
-
-# Install clang-6.0
-RUN wget http://mirrors.kernel.org/ubuntu/pool/main/libj/libjsoncpp/libjsoncpp1_1.7.4-3.1ubuntu2_amd64.deb
-RUN wget http://mirrors.edge.kernel.org/ubuntu/pool/universe/l/llvm-toolchain-6.0/clang-6.0_6.0.1-14_amd64.deb
-RUN wget http://mirrors.edge.kernel.org/ubuntu/pool/universe/l/llvm-toolchain-6.0/libclang-common-6.0-dev_6.0.1-14_amd64.deb
-RUN wget http://mirrors.edge.kernel.org/ubuntu/pool/universe/l/llvm-toolchain-6.0/libclang1-6.0_6.0.1-14_amd64.deb
-RUN wget http://mirrors.edge.kernel.org/ubuntu/pool/universe/l/llvm-toolchain-6.0/libllvm6.0_6.0.1-14_amd64.deb
-
-RUN apt-get install libffi7 libobjc-9-dev
-RUN dpkg -i clang-6.0_6.0.1-14_amd64.deb libclang-common-6.0-dev_6.0.1-14_amd64.deb libclang1-6.0_6.0.1-14_amd64.deb libjsoncpp1_1.7.4-3.1ubuntu2_amd64.deb libllvm6.0_6.0.1-14_amd64.deb
-
-# Install git-lfs
-RUN wget https://github.com/git-lfs/git-lfs/releases/download/v2.4.2/git-lfs-linux-amd64-2.4.2.tar.gz && tar xzvf git-lfs-linux-amd64-2.4.2.tar.gz && cd git-lfs-2.4.2 && sudo bash ./install.sh
-
-##################################################
-# glog
-##################################################
-RUN apt update && apt install -y libgoogle-glog-dev
-
-##################################################
-# Python
-##################################################
-RUN apt update && apt install -y python3.10 python3.10-dev python3.10-venv python3-pip python3-setuptools python3-wheel
-RUN python3 -m pip install python-gitlab elasticsearch torch
-
-############################################
-# miniconda
-############################################
-RUN wget https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh
-RUN bash miniconda.sh -b -p /opt/miniconda
-RUN rm -f miniconda.sh
-
-############################################
-#  Grayskull Riscv
-############################################
-RUN mkdir -p /opt
-RUN curl "https://yyz-gitlab.local.tenstorrent.com/api/v4/projects/11/packages/generic/riscv32i/2020.11.13/riscv32i-v20201113.tar.gz" --output /opt/riscv32i-v20201113.tar.gz
-RUN tar -xvzf /opt/riscv32i-v20201113.tar.gz -C /opt
-RUN rm /opt/riscv32i-v20201113.tar.gz
-
-# Extract seperate risc toolchain for Tensix team
-RUN curl "https://yyz-gitlab.local.tenstorrent.com/api/v4/projects/11/packages/generic/riscv64iafv/2022.03.17/riscv64iafv.tar.gz" --output /opt/riscv64iafv.tar.gz
-RUN tar -xvzf /opt/riscv64iafv.tar.gz -C /opt
-RUN rm /opt/riscv64iafv.tar.gz
-
-##################################################
-# ccache
-##################################################
-RUN apt install -y ccache
-#Across docker runners, we try to share mounted ccache dir
-RUN mkdir -p /runner-ccache
-
-##################################################
-# Set up filesystem
-##################################################
-# Shared home directory and nextstep
-RUN apt update && apt install -y nfs-common cifs-utils
-
-##################################################
-# Set up systemd
-##################################################
-RUN apt install -y --no-install-recommends software-properties-common rsyslog systemd systemd-cron sudo iproute2
-
-##################################################
-# Add new packages here to speed up cached builds - once all builds are versioned caching can be turned on
-##################################################
-# LibGL for YOLO
-RUN apt install -y libgl1-mesa-glx
-# Bazel
-RUN apt install -y openjdk-8-jdk && echo "deb [arch=amd64] http://storage.googleapis.com/bazel-apt stable jdk1.8" | tee /etc/apt/sources.list.d/bazel.list && curl https://bazel.build/bazel-release.pub.gpg | apt-key add - && apt update && apt install -y bazel
-# rsync
-RUN apt install -y rsync
-# bear
-RUN apt install -y bear
-# tqdm
-RUN pip3 install tqdm
-# gmock and gtest
-RUN apt install -y libgtest-dev libgmock-dev
-# perf
-RUN apt update && \
-    apt install -y linux-tools-generic linux-cloud-tools-generic linux-tools-common && \
-    update-alternatives --install /usr/local/bin/perf perf "$(find /usr/lib/linux-tools*/perf | head -1)" 2 && \
-    update-alternatives --install /usr/local/bin/perf perf /usr/bin/perf 1 && \
-    setcap cap_sys_admin,cap_sys_ptrace,cap_syslog=ep "$(readlink -f $(which perf))"
-# clang-format
-RUN wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add - && \
-    add-apt-repository 'deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy main' && \
-    apt update && \
-    apt install -y clang-format
-# llvm-17
-RUN wget https://apt.llvm.org/llvm.sh -P /tmp \
-    && chmod +x /tmp/llvm.sh && \
-    /tmp/llvm.sh 17
-
-FROM base-ubuntu-22-04-amd64 as pybuda-ubuntu-22-04-amd64
-# Set up Gitlab runner
-ARG LOGIN=tester
-# Add user, and grant sudo privileges. Password will be the same as login.
-RUN useradd -m -s /bin/bash -G sudo tester
-RUN echo "tester:tester" | chpasswd
-# Copy a few common files into the image
-RUN chown -R tester:tester /home/tester
-# Change the user that runs the gitlab-runner service to gitlab-runner. This
-# fixes the non-working cancel button in the Gitlab GUI. See the answer
-# provided by Michael Gerber at https://gitlab.com/gitlab-org/gitlab-runner/issues/1662
-RUN sed -i 's/--exec/--user gitlab-runner --exec/g' /etc/init.d/gitlab-runner
-RUN sed -i 's/"--user" "gitlab-runner"//g' /etc/init.d/gitlab-runner
-# The next one prevents the "mesg: ttyname failed: Inappropriate ioctl for device":
-#   (see https://superuser.com/questions/1241548/xubuntu-16-04-ttyname-failed-inappropriate-ioctl-for-device#1253889)
-RUN sed -i 's/mesg n/tty -s \&\& mesg n/g' /root/.profile
-# Setup YYZ isilon home directory
-RUN echo "yyz-isi-01-nfs:/ifs/data/home /home nfs rsize=8192,wsize=8192,timeo=14,intr" >> /etc/fstab
-WORKDIR /home/tester
-CMD ["/bin/bash"]