diff --git a/.github/workflows/image_build.yaml b/.github/workflows/image_build.yaml
index d1be12b..29030be 100644
--- a/.github/workflows/image_build.yaml
+++ b/.github/workflows/image_build.yaml
@@ -35,7 +35,8 @@ jobs:
         with:
           image: ${{ env.IMAGE_NAME }}
           tags: latest ${{ github.sha }} ${{ steps.cleaned_ref_name.outputs.ref_name }}
-          archs: amd64, arm64, s390x
+          # skip arm64 because of https://github.com/dotnet/sdk/issues/29892
+          archs: amd64, ppc64le, s390x
           containerfiles: |
             ./Dockerfile
 
diff --git a/Dockerfile b/Dockerfile
index 697a298..0fc3c49 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,34 +1,36 @@
 # Arguments for DEV's (comment static FROM and uncomnnet #DEV ones)
 ARG UBI_VERSION=8
-ARG DOTNET_VERSION=60
+ARG DOTNET_VERSION=70
 ARG UBI_BUILD_TAG=latest
 ARG UBI_RUNTIME_TAG=latest
 ARG IMAGE_BUILD=registry.access.redhat.com/ubi${UBI_VERSION}/dotnet-${DOTNET_VERSION}:${UBI_TAG}
 ARG IMAGE_BASE=registry.access.redhat.com/ubi${UBI_VERSION}/dotnet-${DOTNET_VERSION}-runtime:${UBI_RUNTIME_TAG}
 
 #DEV FROM $IMAGE_BUILD AS build
-FROM registry.access.redhat.com/ubi8/dotnet-60:6.0-29 AS build
+FROM quay.io/fedora/fedora:38 AS build
+
+RUN dnf install -y dotnet-sdk-7.0
 
 USER root
 COPY . /src
 WORKDIR /src
 
+# https://community.ibm.com/community/user/powerdeveloper/blogs/alhad-deshpande/2023/01/13/identityserver-sqlite-db-on-net-7
+RUN dnf install -y findutils sed
+RUN find -name '*.csproj' -exec sed -i 's|<TargetFramework>net6.0</TargetFramework>|<TargetFramework>net7.0</TargetFramework>|' {} \;
+
 RUN dotnet publish -c Release -o /publish
 
 RUN echo "package info:("$(dotnet list cli-proton-dotnet.sln package)")" >> /publish/VERSION.txt
 
 #DEV FROM $IMAGE_BASE
-FROM registry.access.redhat.com/ubi8/dotnet-60-runtime:6.0-29
+FROM quay.io/fedora/fedora:38
 
 LABEL name="Red Hat Messaging QE - Proton Dotnet CLI Image" \
       run="podman run --rm -ti <image_name:tag> /bin/bash cli-proton-dotnet-*"
 
 USER root
-
-# install fallocate for use by claire tests
-RUN dnf -y --setopt=install_weak_deps=0 --setopt=tsflags=nodocs install \
-    util-linux \
-    && dnf clean all -y
+RUN dnf install -y dotnet-runtime-7.0 && dnf clean all
 
 RUN mkdir /licenses
 COPY ./LICENSE /licenses/LICENSE.txt