diff --git a/Dockerfile b/Dockerfile
index f213952..c6194c6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,7 +16,7 @@ RUN dnf install -y --nogpgcheck \
 # docker-compose - broken dependencies in F38 so removing
 RUN dnf install -y podman-docker buildah skopeo \
   util-linux ansible-core openssh-clients krb5-devel krb5-libs krb5-workstation git jq wget curl unzip coreutils \
-  samba-client samba-common cifs-utils helm doctl gnupg2 pinentry expect gh awscli \
+  samba-client samba-common cifs-utils helm doctl gnupg2 pinentry expect gh awscli glab yq \
   python3-jsonpatch python3-requests-oauthlib python3-kubernetes python3-pyyaml python3-pip \
   && curl -k -s -o - \
     https://nexus.jamesjonesconsulting.com/repository/package-config/dist/proxy/rpmfusion/rpmfusion-setup-proxy-repos.sh |\
@@ -32,20 +32,14 @@ RUN dnf install -y podman-docker buildah skopeo \
   && dnf install -y cpanminus perl-Mojolicious perl-Test-Mojo perl-Test-Harness perl-Perl-Critic perl-Carton \
   && curl -k -s -o /etc/yum.repos.d/okd.repo https://nexus.jamesjonesconsulting.com/repository/package-config/yum/okd.repo \
   && dnf install -y okd-client \
+  && curl -k -s -o /etc/yum.repos.d/okd.repo https://nexus.jamesjonesconsulting.com/repository/package-config/yum/sonarqube-packages.repo \
+  && dnf install -y sonar-scanner-cli-${SONAR_SCANNER_VERSION} \
   && dnf clean all \
   && rm -rf /var/cache/yum \
-  && wget https://github.com/mikefarah/yq/releases/latest/download/yq_linux_amd64 -O /usr/bin/yq \
-  && chmod +x /usr/bin/yq \
   && curl --silent --location "https://github.com/weaveworks/eksctl/releases/latest/download/eksctl_$(uname -s)_amd64.tar.gz" | tar xz -C /tmp \
   && mv /tmp/eksctl /usr/bin \
   && touch /etc/containers/nodocker
 
-RUN curl -L -o sonar-scanner.zip \
-  "https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-${SONAR_SCANNER_VERSION}-linux.zip" && \
-  unzip sonar-scanner.zip -d /opt && \
-  rm -f sonar-scanner.zip && \
-  mv /opt/sonar-scanner* "$SONAR_SCANNER_HOME"
-
 ENV PATH=$SONAR_SCANNER_HOME/bin:$PATH
 
 # Adding some Ansible Key and Timeout setting as well as accepting ssh-rsa