diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 780c6005..5b4e5993 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -10,11 +10,11 @@ on:
 env:
   REGISTRY: ghcr.io
   IMAGE_NAME: ccstudio
-  MAJOR_VER: 12
-  MINOR_VER: 8
+  MAJOR_VER: 20
+  MINOR_VER: 1
   PATCH_VER: 1
-  BUILD_VER: "00005"
-  COMPONENTS: PF_MSP430,PF_MSP432,PF_MSPM0,PF_WCONN,PF_C28,PF_TM4C,PF_HERCULES,PF_SITARA,PF_SITARA_MCU,PF_OMAPL,PF_DAVINCI,PF_OMAP,PF_TDA_DRA,PF_C55,PF_C6000SC,PF_C66AK_KEYSTONE,PF_MMWAVE,PF_C64MC,PF_DIGITAL_POWER,PF_PGA
+  BUILD_VER: "00008"
+  COMPONENTS: PF_MSPM0,PF_MSP430,PF_C28,PF_WCONN,PF_ARM_MPU,PF_SITARA_MCU,PF_MMWAVE,PF_HERCULES,PF_TM4C,PF_C6000SC,PF_OMAPL,PF_MSP432,PF_PGA,PF_DIGITAL_POWER
 
 jobs:
   build-image-and-extract:
diff --git a/Dockerfile b/Dockerfile
index 24f1fa4b..b36dc853 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -47,6 +47,7 @@ RUN apt-get install -y libtinfo5:i386
 RUN apt-get install -y libpython2.7
 RUN apt-get install -y build-essential
 RUN apt-get install -y wget
+RUN apt-get install -y unzip
 
 # Clear APT cache to reduce image size
 RUN apt-get clean && rm -rf /var/lib/apt/lists/*
@@ -60,17 +61,20 @@ ARG PATCH_VER
 ARG BUILD_VER
 
 # Download and extract CCS installation package
-RUN wget -q https://software-dl.ti.com/ccs/esd/CCSv${MAJOR_VER}/CCS_${MAJOR_VER}_${MINOR_VER}_${PATCH_VER}/exports/CCS${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}.${BUILD_VER}_linux-x64.tar.gz
-RUN tar -zxvf CCS${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}.${BUILD_VER}_linux-x64.tar.gz
+RUN wget -q https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-J1VdearkvK/${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}/CCS_${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}.${BUILD_VER}_linux.zip
+RUN unzip CCS_${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}.${BUILD_VER}_linux.zip
 
 ARG COMPONENTS
 
+RUN mkdir /opt/ti
 # Install CCS in unattended mode
-RUN /ccs_install/CCS${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}.${BUILD_VER}_linux-x64/ccs_setup_${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}.${BUILD_VER}.run --mode unattended --enable-components ${COMPONENTS} --prefix /opt/ti --install-BlackHawk false --install-Segger false
+RUN /ccs_install/CCS_${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}.${BUILD_VER}_linux/ccs_setup_${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}.${BUILD_VER}.run --mode unattended --prefix /opt/ti --debuglevel 4 || $(cat /opt/ti/ccs/install_logs/*/ccs_install_20.1.1.00008.log)
 
 # Clean up installation directory
 RUN rm -r /ccs_install
 
+RUN find /opt/ti
+
 # Set working directory to home
 WORKDIR /home