diff --git a/.github/workflows/ibm-mq-make.yaml b/.github/workflows/ibm-mq-make.yaml
index 2663a61f3232..9f818ca14106 100644
--- a/.github/workflows/ibm-mq-make.yaml
+++ b/.github/workflows/ibm-mq-make.yaml
@@ -9,7 +9,7 @@ on:
   pull_request:
     paths:
       - '.github/workflows/ibm-mq-make.yaml'
-  
+
 env:
   REGISTRY_IMAGE: pivotalrabbitmq/ibm-mqadvanced-server-dev
   IBM_MQ_REPOSITORY: ibm-messaging/mq-container
@@ -19,13 +19,13 @@ jobs:
   docker:
     runs-on: ubuntu-latest
     steps:
-      
+
       - name: Docker meta
         id: meta
         uses: docker/metadata-action@v5
         with:
           images: ${{ env.REGISTRY_IMAGE }}
-          
+
       -
         name: Set up QEMU
         uses: docker/setup-qemu-action@v3
@@ -39,9 +39,9 @@ jobs:
           repository: ${{ env.IBM_MQ_REPOSITORY }}
           ref: ${{ env.IBM_MQ_BRANCH_NAME }}
 
-      - name: Prepare image        
+      - name: Prepare image
         run: |
-          ls        
+          ls
           echo "Enabling AMQP capability"
           sed -i -e 's/genmqpkg_incamqp=0/genmqpkg_incamqp=1/g' Dockerfile-server
           echo "AMQP Bootstrap instructions"
@@ -51,11 +51,12 @@ jobs:
           SET AUTHREC PROFILE('SYSTEM.BASE.TOPIC') PRINCIPAL('app') OBJTYPE(TOPIC) AUTHADD(PUB,SUB)
           SET AUTHREC PROFILE('SYSTEM.DEFAULT.MODEL.QUEUE') PRINCIPAL('app') OBJTYPE(QUEUE) AUTHADD(PUT,DSP)
           ALTER CHANNEL(SYSTEM.DEF.AMQP) CHLTYPE(AMQP) MCAUSER('app')
+          STOP SERVICE(SYSTEM.AMQP.SERVICE)
           START SERVICE(SYSTEM.AMQP.SERVICE)
           START CHANNEL(SYSTEM.DEF.AMQP)
           EOF
-          make build-devserver    
-          docker tag ibm-mqadvanced-server-dev:${{ env.IMAGE_TAG }} ${{ env.REGISTRY_IMAGE }}:${{ env.IMAGE_TAG }} 
+          make build-devserver
+          docker tag ibm-mqadvanced-server-dev:${{ env.IMAGE_TAG }} ${{ env.REGISTRY_IMAGE }}:${{ env.IMAGE_TAG }}
       -
         name: Login to Docker Hub
         uses: docker/login-action@v3
@@ -64,4 +65,4 @@ jobs:
           password: ${{ secrets.DOCKERHUB_PASSWORD }}
       - name: Push
         run: |
-          docker push ${{ env.REGISTRY_IMAGE }}:${{ env.IMAGE_TAG }}
\ No newline at end of file
+          docker push ${{ env.REGISTRY_IMAGE }}:${{ env.IMAGE_TAG }}