diff --git a/.github/workflows/github-ci.yml b/.github/workflows/github-ci.yml
index 0540099..bbac027 100644
--- a/.github/workflows/github-ci.yml
+++ b/.github/workflows/github-ci.yml
@@ -3,14 +3,17 @@ name: Pip.Services Postgres Go Delivery
 # Configure trigger rules
 on: 
   push:
+    branches:
+      - main
     paths:
     - '**'
     - '!README.md'
+  workflow_dispatch:
 
 jobs:
   # Setup job
   setup:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     if: "!contains(github.event.head_commit.message, '[skip-ci]')"
 
     steps:
@@ -42,7 +45,7 @@ jobs:
   # Authoring job
   authoring:
     needs: setup
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     steps:
     - name: Checkout source code
@@ -85,7 +88,7 @@ jobs:
   measure:
     needs: authoring
     if: always()
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     steps: 
     - name: Get cached intermediate data
diff --git a/component.json b/component.json
index 9850c10..975d494 100644
--- a/component.json
+++ b/component.json
@@ -4,7 +4,7 @@
     "language": "go",
     "version": "1.2.11",
     "build": 0,
-    "registry": "pipdevs",
+    "registry": "pipservices",
     "artifacts": [
     ]
 }
\ No newline at end of file
diff --git a/docker/docker-compose.test.yml b/docker/docker-compose.test.yml
index 63879e4..ba58b52 100644
--- a/docker/docker-compose.test.yml
+++ b/docker/docker-compose.test.yml
@@ -5,7 +5,7 @@ services:
     build:
       context: ..
       dockerfile: docker/Dockerfile.test
-    image: ${IMAGE:-pipdevs/test}
+    image: ${IMAGE:-pipservices/test}
     links:
       - postgres
     environment: