diff --git a/Makefile b/Makefile
index 93c2e6e9..321c3e82 100644
--- a/Makefile
+++ b/Makefile
@@ -276,12 +276,12 @@ test-push-pull-verbose: binary check-skopeo $(BATS)
 
 .PHONY: test-bats-sync
 test-bats-sync: EXTENSIONS=sync
-test-bats-sync: binary binary-minimal check-skopeo $(BATS)
+test-bats-sync: binary binary-minimal check-skopeo $(BATS) $(NOTATION) $(COSIGN)
 	$(BATS) --trace --print-output-on-failure test/blackbox/sync.bats
 	
 .PHONY: test-bats-sync-verbose
 test-bats-sync-verbose: EXTENSIONS=sync
-test-bats-sync-verbose: binary binary-minimal check-skopeo $(BATS)
+test-bats-sync-verbose: binary binary-minimal check-skopeo $(BATS) $(NOTATION) $(COSIGN)
 	$(BATS) --trace -t -x -p --verbose-run --print-output-on-failure --show-output-of-passing-tests test/blackbox/sync.bats
 
 .PHONY: test-bats-cve
diff --git a/test/blackbox/sync.bats b/test/blackbox/sync.bats
index 169e39f4..857b6207 100644
--- a/test/blackbox/sync.bats
+++ b/test/blackbox/sync.bats
@@ -7,25 +7,67 @@ function setup_file() {
     fi
 
     # Download test data to folder common for the entire suite, not just this file
-    skopeo --insecure-policy copy --format=oci docker://ghcr.io/project-zot/golang:1.17 oci:${TEST_DATA_DIR}/golang:1.17
+    skopeo --insecure-policy copy --format=oci docker://ghcr.io/project-zot/golang:1.19 oci:${TEST_DATA_DIR}/golang:1.19
     # Setup zot server
-    local zot_root_dir=${BATS_FILE_TMPDIR}/zot
+    local zot_sync_per_root_dir=${BATS_FILE_TMPDIR}/zot-per
+    local zot_sync_ondemand_root_dir=${BATS_FILE_TMPDIR}/zot-ondemand
+
+    local zot_sync_per_config_file=${BATS_FILE_TMPDIR}/zot_sync_per_config.json
+    local zot_sync_ondemand_config_file=${BATS_FILE_TMPDIR}/zot_sync_ondemand_config.json
+
     local zot_minimal_root_dir=${BATS_FILE_TMPDIR}/zot-minimal
-    local zot_config_file=${BATS_FILE_TMPDIR}/zot_config.json
     local zot_minimal_config_file=${BATS_FILE_TMPDIR}/zot_minimal_config.json
+
     local oci_data_dir=${BATS_FILE_TMPDIR}/oci
-    mkdir -p ${zot_root_dir}
+    mkdir -p ${zot_sync_per_root_dir}
+    mkdir -p ${zot_sync_ondemand_root_dir}
     mkdir -p ${zot_minimal_root_dir}
     mkdir -p ${oci_data_dir}
-    cat >${zot_config_file} <<EOF
+
+    cat >${zot_sync_per_config_file} <<EOF
 {
     "distSpecVersion": "1.0.1",
     "storage": {
-        "rootDirectory": "${zot_root_dir}"
+        "rootDirectory": "${zot_sync_per_root_dir}"
     },
     "http": {
         "address": "0.0.0.0",
-        "port": "8080"
+        "port": "8081"
+    },
+    "log": {
+        "level": "debug"
+    },
+    "extensions": {
+        "sync": {
+            "registries": [
+                {
+                    "urls": [
+                        "http://localhost:9000"
+                    ],
+                    "onDemand": false,
+                    "tlsVerify": false,
+                    "PollInterval": "5s",
+                    "content": [
+                        {
+                            "prefix": "**"
+                        }
+                    ]
+                }
+            ]
+        }
+    }
+}
+EOF
+
+    cat >${zot_sync_ondemand_config_file} <<EOF
+{
+    "distSpecVersion": "1.0.1",
+    "storage": {
+        "rootDirectory": "${zot_sync_ondemand_root_dir}"
+    },
+    "http": {
+        "address": "0.0.0.0",
+        "port": "8082"
     },
     "log": {
         "level": "debug"
@@ -39,7 +81,6 @@ function setup_file() {
                     ],
                     "onDemand": true,
                     "tlsVerify": false,
-                    "PollInterval": "20s",
                     "content": [
                         {
                             "prefix": "**"
@@ -66,37 +107,337 @@ EOF
     }
 }
 EOF
-    setup_zot_file_level ${zot_config_file}
-    wait_zot_reachable "http://127.0.0.1:8080/v2/_catalog"
+    git -C ${BATS_FILE_TMPDIR} clone https://github.com/project-zot/helm-charts.git
+
+    setup_zot_file_level ${zot_sync_per_config_file}
+    wait_zot_reachable "http://127.0.0.1:8081/v2/_catalog"
+
+    setup_zot_file_level ${zot_sync_ondemand_config_file}
+    wait_zot_reachable "http://127.0.0.1:8082/v2/_catalog"
 
     setup_zot_minimal_file_level ${zot_minimal_config_file}
     wait_zot_reachable "http://127.0.0.1:9000/v2/_catalog"
 }
 
 function teardown_file() {
-    local zot_root_dir=${BATS_FILE_TMPDIR}/zot
+    local zot_sync_per_root_dir=${BATS_FILE_TMPDIR}/zot-per
+    local zot_sync_ondemand_root_dir=${BATS_FILE_TMPDIR}/zot-ondemand
     local oci_data_dir=${BATS_FILE_TMPDIR}/oci
     local zot_minimal_root_dir=${BATS_FILE_TMPDIR}/zot-minimal
     teardown_zot_file_level
-    rm -rf ${zot_root_dir}
+    rm -rf ${zot_sync_per_root_dir}
+    rm -rf ${zot_sync_ondemand_root_dir}
     rm -rf ${zot_minimal_root_dir}
     rm -rf ${oci_data_dir}
 }
 
-@test "sync registry" {
+# sync image
+@test "sync golang image periodically" {
     run skopeo --insecure-policy copy --dest-tls-verify=false \
-        oci:${TEST_DATA_DIR}/golang:1.17 \
-        docker://127.0.0.1:9000/golang:1.17
+        oci:${TEST_DATA_DIR}/golang:1.19 \
+        docker://127.0.0.1:9000/golang:1.19
     [ "$status" -eq 0 ]
     run curl http://127.0.0.1:9000/v2/_catalog
     [ "$status" -eq 0 ]
     [ $(echo "${lines[-1]}" | jq '.repositories[]') = '"golang"' ]
-    run curl http://127.0.0.1:8080/v2/_catalog
+    run curl http://127.0.0.1:8081/v2/_catalog
     run curl http://127.0.0.1:9000/v2/golang/tags/list
     [ "$status" -eq 0 ]
-    [ $(echo "${lines[-1]}" | jq '.tags[]') = '"1.17"' ]
-    run sleep 30s
-    run curl http://127.0.0.1:8080/v2/_catalog
+    [ $(echo "${lines[-1]}" | jq '.tags[]') = '"1.19"' ]
+    
+    run sleep 20s
+    
+    run curl http://127.0.0.1:8081/v2/_catalog
     [ "$status" -eq 0 ]
     [ $(echo "${lines[-1]}" | jq '.repositories[]') = '"golang"' ]
+
+    run curl http://127.0.0.1:8081/v2/golang/tags/list
+    [ "$status" -eq 0 ]
+    [ $(echo "${lines[-1]}" | jq '.tags[]') = '"1.19"' ]
+}
+
+@test "sync golang image ondemand" {
+    run skopeo --insecure-policy copy --dest-tls-verify=false \
+        oci:${TEST_DATA_DIR}/golang:1.19 \
+        docker://127.0.0.1:9000/golang:1.19
+    [ "$status" -eq 0 ]
+    run curl http://127.0.0.1:9000/v2/_catalog
+    [ "$status" -eq 0 ]
+    [ $(echo "${lines[-1]}" | jq '.repositories[]') = '"golang"' ]
+
+    # sync golang on demand
+    run curl http://127.0.0.1:8082/v2/golang/manifests/1.19
+    [ "$status" -eq 0 ]
+
+    run curl http://127.0.0.1:9000/v2/golang/tags/list
+    [ "$status" -eq 0 ]
+    [ $(echo "${lines[-1]}" | jq '.tags[]') = '"1.19"' ]
+
+    run curl http://127.0.0.1:8082/v2/_catalog
+    [ "$status" -eq 0 ]
+    [ $(echo "${lines[-1]}" | jq '.repositories[]') = '"golang"' ]
+
+    run curl http://127.0.0.1:8082/v2/golang/tags/list
+    [ "$status" -eq 0 ]
+    [ $(echo "${lines[-1]}" | jq '.tags[]') = '"1.19"' ]
+}
+
+# sync index
+@test "sync image index periodically" {
+    # --multi-arch below pushes an image index (containing many images) instead
+    # of an image manifest (single image)
+    run skopeo --insecure-policy copy --format=oci --dest-tls-verify=false --multi-arch=all \
+        docker://public.ecr.aws/docker/library/busybox:latest \
+        docker://127.0.0.1:9000/busybox:latest
+    [ "$status" -eq 0 ]
+    run curl http://127.0.0.1:9000/v2/_catalog
+    [ "$status" -eq 0 ]
+    [ $(echo "${lines[-1]}" | jq '.repositories[0]') = '"busybox"' ]
+    run curl http://127.0.0.1:9000/v2/busybox/tags/list
+    [ "$status" -eq 0 ]
+    [ $(echo "${lines[-1]}" | jq '.tags[]') = '"latest"' ]
+
+    run sleep 30s
+
+    run curl http://127.0.0.1:8081/v2/_catalog
+    [ "$status" -eq 0 ]
+    [ $(echo "${lines[-1]}" | jq '.repositories[0]') = '"busybox"' ]
+
+    run curl http://127.0.0.1:8081/v2/busybox/tags/list
+    [ "$status" -eq 0 ]
+    [ $(echo "${lines[-1]}" | jq '.tags[]') = '"latest"' ]
+}
+
+@test "sync image index on demand" {
+    # --multi-arch below pushes an image index (containing many images) instead
+    # of an image manifest (single image)
+    run skopeo --insecure-policy copy --format=oci --dest-tls-verify=false --multi-arch=all \
+        docker://public.ecr.aws/docker/library/busybox:latest \
+        docker://127.0.0.1:9000/busybox:latest
+    [ "$status" -eq 0 ]
+    run curl http://127.0.0.1:9000/v2/_catalog
+    [ "$status" -eq 0 ]
+    [ $(echo "${lines[-1]}" | jq '.repositories[1]') = '"golang"' ]
+    run curl http://127.0.0.1:9000/v2/busybox/tags/list
+    [ "$status" -eq 0 ]
+    [ $(echo "${lines[-1]}" | jq '.tags[]') = '"latest"' ]
+
+    # sync busybox index on demand
+    run curl http://127.0.0.1:8082/v2/busybox/manifests/latest
+    [ "$status" -eq 0 ]
+
+    run curl http://127.0.0.1:8082/v2/_catalog
+    [ "$status" -eq 0 ]
+    [ $(echo "${lines[-1]}" | jq '.repositories[1]') = '"golang"' ]
+
+    run curl http://127.0.0.1:8082/v2/busybox/tags/list
+    [ "$status" -eq 0 ]
+    [ $(echo "${lines[-1]}" | jq '.tags[]') = '"latest"' ]
+}
+
+# sign signatures
+@test "sign/verify with cosign" {
+    run cosign initialize
+    [ "$status" -eq 0 ]
+    run cosign generate-key-pair
+    [ "$status" -eq 0 ]
+    run cosign sign --key cosign.key localhost:9000/golang:1.19 --yes
+    [ "$status" -eq 0 ]
+    run cosign verify --key cosign.pub localhost:9000/golang:1.19
+    [ "$status" -eq 0 ]
+}
+
+@test "sign/verify with notation" {
+    run notation cert generate-test --trust "notation-sign-sync-test"
+    [ "$status" -eq 0 ]
+    run notation sign --key "notation-sign-sync-test" --plain-http localhost:9000/golang:1.19
+    [ "$status" -eq 0 ]
+    run notation verify --cert "notation-sign-sync-test" --plain-http localhost:9000/golang:1.19
+    [ "$status" -eq 0 ]
+    run notation list --plain-http localhost:9000/golang:1.19
+    [ "$status" -eq 0 ]
+}
+
+@test "sync signatures periodically" {
+    # wait for signatures to be copied
+    run sleep 5s
+
+    run notation verify --cert "notation-sign-sync-test" --plain-http localhost:8081/golang:1.19
+    [ "$status" -eq 0 ]
+
+    run cosign verify --key cosign.pub localhost:8081/golang:1.19
+    [ "$status" -eq 0 ]
+}
+
+@test "sync signatures ondemand" {
+    run notation verify --cert "notation-sign-sync-test" --plain-http localhost:8082/golang:1.19
+    [ "$status" -eq 0 ]
+
+    run cosign verify --key cosign.pub localhost:8082/golang:1.19
+    [ "$status" -eq 0 ]
+}
+
+# sync oras artifacts
+@test "push oras artifact periodically" {
+    echo "{\"name\":\"foo\",\"value\":\"bar\"}" > config.json
+    echo "hello world" > artifact.txt
+    run oras push --plain-http 127.0.0.1:9000/hello-artifact:v2 \
+        --config config.json:application/vnd.acme.rocket.config.v1+json artifact.txt:text/plain -d -v
+    [ "$status" -eq 0 ]
+    rm -f artifact.txt
+    rm -f config.json
+}
+
+@test "sync oras artifact periodically" {
+#     # wait for oras artifact to be copied
+    run sleep 5s
+    run oras pull --plain-http 127.0.0.1:8081/hello-artifact:v2 -d -v
+    [ "$status" -eq 0 ]
+    grep -q "hello world" artifact.txt
+    rm -f artifact.txt
+}
+
+@test "sync oras artifact on demand" {
+    run oras pull --plain-http 127.0.0.1:8082/hello-artifact:v2 -d -v
+    [ "$status" -eq 0 ]
+    grep -q "hello world" artifact.txt
+    rm -f artifact.txt
+}
+
+# sync helm chart
+@test "push helm chart" {
+    run helm package ${BATS_FILE_TMPDIR}/helm-charts/charts/zot
+    [ "$status" -eq 0 ]
+    local chart_version=$(awk '/version/{printf $2}' ${BATS_FILE_TMPDIR}/helm-charts/charts/zot/Chart.yaml)
+    run helm push zot-${chart_version}.tgz oci://localhost:9000/zot-chart
+    [ "$status" -eq 0 ]
+}
+
+@test "sync helm chart periodically" {
+     # wait for helm chart to be copied
+    run sleep 5s
+
+    local chart_version=$(awk '/version/{printf $2}' ${BATS_FILE_TMPDIR}/helm-charts/charts/zot/Chart.yaml)
+    run helm pull oci://localhost:8081/zot-chart/zot --version ${chart_version}
+    [ "$status" -eq 0 ]
+}
+
+@test "sync helm chart on demand" {
+    local chart_version=$(awk '/version/{printf $2}' ${BATS_FILE_TMPDIR}/helm-charts/charts/zot/Chart.yaml)
+    run helm pull oci://localhost:8082/zot-chart/zot --version ${chart_version}
+    [ "$status" -eq 0 ]
+}
+
+# sync OCI artifacts
+@test "push OCI artifact with regclient" {
+    run regctl registry set localhost:9000 --tls disabled
+    run regctl registry set localhost:8081 --tls disabled
+    run regctl registry set localhost:8082 --tls disabled
+
+    run regctl artifact put localhost:9000/artifact:demo <<EOF
+this is an artifact
+EOF
+    [ "$status" -eq 0 ]
+}
+
+@test "sync OCI artifact periodically" {
+    # wait for helm chart to be copied
+    run sleep 5s
+    run regctl manifest get localhost:8081/artifact:demo
+    [ "$status" -eq 0 ]
+    run regctl artifact get localhost:8081/artifact:demo
+    [ "$status" -eq 0 ]
+    [ "${lines[-1]}" == "this is an artifact" ]
+}
+
+@test "sync OCI artifact on demand" {
+    run regctl manifest get localhost:8082/artifact:demo
+    [ "$status" -eq 0 ]
+    run regctl artifact get localhost:8082/artifact:demo
+    [ "$status" -eq 0 ]
+    [ "${lines[-1]}" == "this is an artifact" ]
+}
+
+@test "push OCI artifact references with regclient" {
+    run regctl artifact put localhost:9000/manifest-ref:demo <<EOF
+test artifact
+EOF
+    [ "$status" -eq 0 ]
+    run regctl artifact list localhost:9000/manifest-ref:demo --format raw-body
+    [ "$status" -eq 0 ]
+    [ $(echo "${lines[-1]}" | jq '.manifests | length') -eq 0 ]
+    run regctl artifact put --annotation  demo=true --annotation format=oci --artifact-type "application/vnd.example.icecream.v1" --subject localhost:9000/manifest-ref:demo << EOF
+test reference
+EOF
+    [ "$status" -eq 0 ]
+    # with artifact media-type
+    run regctl artifact put localhost:9000/artifact-ref:demo <<EOF
+test artifact
+EOF
+    [ "$status" -eq 0 ]
+    run regctl artifact list localhost:9000/artifact-ref:demo --format raw-body
+    [ "$status" -eq 0 ]
+    [ $(echo "${lines[-1]}" | jq '.manifests | length') -eq 0 ]
+    run regctl artifact put --media-type  "application/vnd.oci.artifact.manifest.v1+json" --annotation  demo=true --annotation format=oci --artifact-type "application/vnd.example.icecream.v1" --subject localhost:9000/artifact-ref:demo << EOF
+test reference
+EOF
+    [ "$status" -eq 0 ]
+}
+
+@test "sync OCI artifact references periodically" {
+    # wait for OCI artifacts to be copied
+    run sleep 5
+    run regctl artifact get localhost:8081/manifest-ref:demo
+    [ "$status" -eq 0 ]
+    [ "${lines[-1]}" == "test artifact" ]
+    run regctl artifact list localhost:8081/manifest-ref:demo --format raw-body
+    [ "$status" -eq 0 ]
+    [ $(echo "${lines[-1]}" | jq '.manifests | length') -eq 1 ]
+    run regctl artifact list --filter-artifact-type "application/vnd.example.icecream.v1" localhost:8081/manifest-ref:demo --format raw-body
+    [ "$status" -eq 0 ]
+    [ $(echo "${lines[-1]}" | jq '.manifests | length') -eq 1 ]
+    run regctl artifact list --filter-artifact-type "application/invalid" localhost:8081/manifest-ref:demo --format raw-body
+    [ "$status" -eq 0 ]
+    [ $(echo "${lines[-1]}" | jq '.manifests | length') -eq 0 ]
+    # with artifact media-type
+    run regctl artifact get localhost:8081/artifact-ref:demo
+    [ "$status" -eq 0 ]
+    [ "${lines[-1]}" == "test artifact" ]
+    run regctl artifact list localhost:8081/artifact-ref:demo --format raw-body
+    [ "$status" -eq 0 ]
+    [ $(echo "${lines[-1]}" | jq '.manifests | length') -eq 1 ]
+    run regctl artifact list --filter-artifact-type "application/vnd.example.icecream.v1" localhost:8081/artifact-ref:demo --format raw-body
+    [ "$status" -eq 0 ]
+    [ $(echo "${lines[-1]}" | jq '.manifests | length') -eq 1 ]
+    run regctl artifact list --filter-artifact-type "application/invalid" localhost:8081/artifact-ref:demo --format raw-body
+    [ "$status" -eq 0 ]
+    [ $(echo "${lines[-1]}" | jq '.manifests | length') -eq 0 ]
+}
+
+@test "sync OCI artifact references on demand" {
+    run regctl artifact get localhost:8082/manifest-ref:demo
+    [ "$status" -eq 0 ]
+    [ "${lines[-1]}" == "test artifact" ]
+    run regctl artifact list localhost:8082/manifest-ref:demo --format raw-body
+    [ "$status" -eq 0 ]
+    [ $(echo "${lines[-1]}" | jq '.manifests | length') -eq 1 ]
+    run regctl artifact list --filter-artifact-type "application/vnd.example.icecream.v1" localhost:8082/manifest-ref:demo --format raw-body
+    [ "$status" -eq 0 ]
+    [ $(echo "${lines[-1]}" | jq '.manifests | length') -eq 1 ]
+    run regctl artifact list --filter-artifact-type "application/invalid" localhost:8082/manifest-ref:demo --format raw-body
+    [ "$status" -eq 0 ]
+    [ $(echo "${lines[-1]}" | jq '.manifests | length') -eq 0 ]
+    # with artifact media-type
+    run regctl artifact get localhost:8082/artifact-ref:demo
+    [ "$status" -eq 0 ]
+    [ "${lines[-1]}" == "test artifact" ]
+    run regctl artifact list localhost:8082/artifact-ref:demo --format raw-body
+    [ "$status" -eq 0 ]
+    [ $(echo "${lines[-1]}" | jq '.manifests | length') -eq 1 ]
+    run regctl artifact list --filter-artifact-type "application/vnd.example.icecream.v1" localhost:8082/artifact-ref:demo --format raw-body
+    [ "$status" -eq 0 ]
+    [ $(echo "${lines[-1]}" | jq '.manifests | length') -eq 1 ]
+    run regctl artifact list --filter-artifact-type "application/invalid" localhost:8082/artifact-ref:demo --format raw-body
+    [ "$status" -eq 0 ]
+    [ $(echo "${lines[-1]}" | jq '.manifests | length') -eq 0 ]
 }