diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
index 83e649e..40b6d94 100644
--- a/.github/workflows/master.yml
+++ b/.github/workflows/master.yml
@@ -4,7 +4,7 @@ name: Merge into master - Build and Run Tests
 
 on:
   push:
-    branches: ["master"]
+    branches: ["main"]
 
 env:
   REGISTRY: ghcr.io
diff --git a/.github/workflows/pr-development.yml b/.github/workflows/pr-development.yml
index 864424a..7841297 100644
--- a/.github/workflows/pr-development.yml
+++ b/.github/workflows/pr-development.yml
@@ -4,7 +4,7 @@ name: PR development - Build and Run Tests
 
 on:
   pull_request:
-    branches: ["master"]
+    branches: ["main"]
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
diff --git a/.github/workflows/taskr.yml b/.github/workflows/taskr.yml
deleted file mode 100644
index 1a96c8f..0000000
--- a/.github/workflows/taskr.yml
+++ /dev/null
@@ -1,82 +0,0 @@
-name: Build and Run Tests
-
-on:
-  pull_request:
-    branches: [ "main" ]
-  push:
-    branches: [ "main" ]
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
-  cancel-in-progress: true
-
-jobs:
-
-  # Build TaskR and run tests
-  build:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v4
-    - name: Updating Apt
-      run: sudo apt update
-    - name: Installing apt packages
-      run: |
-            sudo apt install -y build-essential
-            sudo apt install -y git
-            sudo apt install -y libgtest-dev
-            sudo apt install -y libhwloc-dev
-            sudo apt install -y libopenblas-dev
-            sudo apt install -y liblapack-dev
-            sudo apt install -y liblapacke-dev
-            sudo apt install -y libboost-context-dev
-            sudo apt install -y curl
-            sudo apt install -y jq
-            sudo apt install -y pkgconf
-            sudo apt install -y wget
-            sudo apt install -y sudo
-            sudo apt install -y libopenmpi-dev
-            sudo apt install -y cmake
-            sudo apt install -y libstb-dev
-            sudo apt install -y libsfml-dev
-            sudo apt install -y libtclap-dev
-    - name: Installing meson, ninja and gcovr
-      run: python3 -m pip install meson ninja gcovr
-    - name: Install OVNI 
-      run:  |
-            git clone --recursive https://github.com/bsc-pm/ovni.git $HOME/ovni
-            cd $HOME/ovni
-            mkdir build
-            cd build
-            cmake .. -DCMAKE_INSTALL_PREFIX=/usr/local -DBUILD_TESTING=FALSE
-            make -j8
-            sudo make install
-            sudo rm -rf $HOME/ovni
-    - name: Install NOS-V 
-      run:  |
-            git clone -b 3.1.0 --recursive https://github.com/bsc-pm/nos-v.git $HOME/nos-v
-            cd $HOME/nos-v
-            autoreconf -f -i -v
-            ./configure --prefix=/usr/local --with-ovni=/usr/local
-            make all
-            sudo make install
-            cd ..
-            rm -rf $HOME/nos-v
-            sudo sed -i '/^\[instrumentation\]/,/^\[/{s/version *= *"none"/version = "ovni"/}' /usr/local/share/nosv.toml 
-            sudo sed -i '/^\[ovni\]/,/^\[/{s/level *= *2/level = 0/}' /usr/local/share/nosv.toml
-    - name: Updating submodules 
-      run: git submodule update --init --recursive
-    - name: Building all modules
-      run:  |
-            echo "Building..."
-            mkdir build
-            meson setup build -DdistributedEngine=mpi -DbuildTests=true -DbuildExamples=true -DcompileWarningsAsErrors=true
-            meson compile -C build
-    - name: Running tests 
-      run:  |
-            echo "Running Tests..."
-            meson test -C build
-    - uses: actions/upload-artifact@v4
-      if: always()
-      with:
-        name: meson-logs
-        path: build/meson-logs/
\ No newline at end of file
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index aa7f19f..baae1a7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,5 @@
 build:
-  image: ghcr.io/algebraic-programming/taskr/buildenv-x86_64:latest
+  image: ghcr.io/algebraic-programming/taskr/buildenv:latest
   variables:
     GIT_SUBMODULE_STRATEGY: recursive
   tags: