diff --git a/.github/workflows/apigws/workflow.yml b/.github/workflows/apigws.yml
similarity index 100%
rename from .github/workflows/apigws/workflow.yml
rename to .github/workflows/apigws.yml
diff --git a/.github/workflows/buildimages.yaml b/.github/workflows/buildimages.yaml
deleted file mode 100644
index 2e58cad21..000000000
--- a/.github/workflows/buildimages.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
-parameters:
-  services: ''
-  registryEndpoint: ''
-  helmfrom: ''
-  helmto: ''
-
-jobs:
-- job: BuildContainersForPR_Linux
-  condition: eq('${{ variables['Build.Reason'] }}', 'PullRequest')
-  pool:
-    vmImage: 'ubuntu-16.04'
-  steps:
-  - bash: docker-compose -f src/docker-compose.yml build ${{ parameters.services }}
-    displayName: Compose build ${{ parameters.services }}
-    env:
-      TAG: ${{ variables['Build.SourceBranchName'] }}
-- job: BuildContainersForPR_Windows
-  condition: False
-  # condition: eq('${{ variables['Build.Reason'] }}', 'PullRequest')
-  pool:
-    vmImage: 'windows-2019'
-  steps:
-  - bash: docker-compose f src/docker-compose.yml build ${{ parameters.services }}
-    displayName: Compose build ${{ parameters.services }}
-    env:
-      TAG: ${{ variables['Build.SourceBranchName'] }}
-      PLATFORM: win
-      NODE_IMAGE: stefanscherer/node-windows:10
-- job: BuildLinux
-  condition: ne('${{ variables['Build.Reason'] }}', 'PullRequest')
-  pool:
-    vmImage: 'ubuntu-16.04'
-  steps:
-  - task: DockerCompose@0
-    displayName: Compose build ${{ parameters.services }}
-    inputs:
-      dockerComposeCommand: 'build ${{ parameters.services }}'
-      containerregistrytype: Container Registry
-      dockerRegistryEndpoint: ${{ parameters.registryEndpoint }}
-      dockerComposeFile: src/docker-compose.yml
-      qualifyImageNames: true
-      projectName: ""
-      dockerComposeFileArgs: |
-        TAG=${{ variables['Build.SourceBranchName'] }}
-  - task: DockerCompose@0
-    displayName: Compose push ${{ parameters.images }}
-    inputs:
-      dockerComposeCommand: 'push ${{ parameters.services }}'
-      containerregistrytype: Container Registry
-      dockerRegistryEndpoint: ${{ parameters.registryEndpoint }}
-      dockerComposeFile: src/docker-compose.yml
-      qualifyImageNames: true
-      projectName: ""
-      dockerComposeFileArgs: |
-        TAG=${{ variables['Build.SourceBranchName'] }}
-  - task: CopyFiles@2
-    inputs:
-      sourceFolder: ${{ parameters.helmfrom }}
-      targetFolder: ${{ parameters.helmto }}
-  - task: PublishBuildArtifacts@1
-    inputs:
-      pathtoPublish: ${{ parameters.helmto }}
-      artifactName: helm
-- job: BuildWindows
-  condition: False
-  # condition: ne('${{ variables['Build.Reason'] }}', 'PullRequest')
-  pool:
-    vmImage: 'windows-2019'
-  steps:
-  - task: DockerCompose@0
-    displayName: Compose build ${{ parameters.services }}
-    inputs:
-      dockerComposeCommand: 'build ${{ parameters.services }}'
-      containerregistrytype: Container Registry
-      dockerRegistryEndpoint: ${{ parameters.registryEndpoint }}
-      dockerComposeFile: src/docker-compose.yml
-      qualifyImageNames: true
-      projectName: ""
-      dockerComposeFileArgs: |
-        TAG=${{ variables['Build.SourceBranchName'] }}
-        PLATFORM=win
-        NODE_IMAGE=stefanscherer/node-windows:10
-  - task: DockerCompose@0
-    displayName: Compose push ${{ parameters.services }}
-    inputs:
-      dockerComposeCommand: 'push ${{ parameters.services }}'
-      containerregistrytype: Container Registry
-      dockerRegistryEndpoint: ${{ parameters.registryEndpoint }}
-      dockerComposeFile: src/docker-compose.yml
-      qualifyImageNames: true
-      projectName: ""
-      dockerComposeFileArgs: |
-        TAG=${{ variables['Build.SourceBranchName'] }}
-        PLATFORM=win
diff --git a/.github/workflows/multiarch.yaml b/.github/workflows/multiarch.yaml
deleted file mode 100644
index 7f2dd1ee4..000000000
--- a/.github/workflows/multiarch.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-env:
-  image: ''
-  branch: ''
-  registry: eshop
-  registryEndpoint: ''
-jobs:
-  manifest:
-    runs-on: Ubuntu 16.04
-    needs:
-    - BuildLinux
-    if: and(,ne('${{ env.variables['Build.Reason']  }}', 'PullRequest'))
-    steps:
-    - uses: actions/checkout@v2
-    - name: Docker Login
-      run: docker login
-    - name: Create multiarch manifest
-      run: |
-        mkdir -p ~/.docker
-        sed '$ s/.$//' $DOCKER_CONFIG/config.json > ~/.docker/config.json
-        echo ',"experimental": "enabled" }' >> ~/.docker/config.json
-        docker --config ~/.docker manifest create ${{ env.parameters.registry  }}/${{ env.parameters.image  }}:${{ env.parameters.branch  }} ${{ env.parameters.registry  }}/${{ env.parameters.image  }}:linux-${{ env.parameters.branch  }}
-        docker --config ~/.docker manifest create ${{ env.parameters.registry  }}/${{ env.parameters.image  }}:latest ${{ env.parameters.registry  }}/${{ env.parameters.image  }}:linux-latest
-        docker --config ~/.docker manifest push ${{ env.parameters.registry  }}/${{ env.parameters.image  }}:${{ env.parameters.branch  }}
-        docker --config ~/.docker manifest push ${{ env.parameters.registry  }}/${{ env.parameters.image  }}:latest
-      shell: bash
\ No newline at end of file