diff --git a/make/photon/prepare/utils/docker_compose.py b/make/photon/prepare/utils/docker_compose.py
@@ -8,7 +8,7 @@
 docker_compose_yml_path = '/compose_location/docker-compose.yml'
 
 # render docker-compose
-def prepare_docker_compose(configs, with_trivy, with_notary, with_chartmuseum):
+def prepare_docker_compose(configs, with_trivy, with_notary):
     versions = parse_versions()
     VERSION_TAG = versions.get('VERSION_TAG') or 'dev'
 
@@ -18,7 +18,6 @@ def prepare_docker_compose(configs, with_trivy, with_notary, with_chartmuseum):
         'redis_version': VERSION_TAG,
         'notary_version': VERSION_TAG,
         'trivy_adapter_version': VERSION_TAG,
-        'chartmuseum_version': VERSION_TAG,
         'data_volume': configs['data_volume'],
         'log_location': configs['log_location'],
         'protocol': configs['protocol'],
@@ -27,7 +26,6 @@ def prepare_docker_compose(configs, with_trivy, with_notary, with_chartmuseum):
         'external_database': configs['external_database'],
         'with_notary': with_notary,
         'with_trivy': with_trivy,
-        'with_chartmuseum': with_chartmuseum
     }
 
     # if configs.get('registry_custom_ca_bundle_path'):

diff --git a/make/photon/prepare/utils/jobservice.py b/make/photon/prepare/utils/jobservice.py
@@ -18,8 +18,6 @@ def prepare_job_service(config_dict):
     # Job log and exported reports are stored in data dir
     job_log_dir = os.path.join('/data', "job_logs")
     prepare_dir(job_log_dir, uid=DEFAULT_UID, gid=DEFAULT_GID)
-    job_log_dir = os.path.join('/data', "scandata_exports")
-    prepare_dir(job_log_dir, uid=DEFAULT_UID, gid=DEFAULT_GID)
 
     # Render Jobservice env
     render_jinja(
@@ -35,6 +33,7 @@ def prepare_job_service(config_dict):
         gid=DEFAULT_GID,
         internal_tls=config_dict['internal_tls'],
         max_job_workers=config_dict['max_job_workers'],
+        logger_sweeper_duration=config_dict['logger_sweeper_duration'],
         redis_url=config_dict['redis_url_js'],
         level=log_level,
         metric=config_dict['metric'])
diff --git a/make/photon/prepare/utils/registry.py b/make/photon/prepare/utils/registry.py
@@ -2,7 +2,7 @@
 import os
 import subprocess
 from g import config_dir, templates_dir, DEFAULT_GID, DEFAULT_UID, data_dir
-from urllib.parse import urlsplit
+from urllib.parse import urlsplit, unquote
 from utils.jinja import render_jinja
 from utils.misc import prepare_dir
 
@@ -46,14 +46,14 @@ def parse_redis(redis_url):
     if not u.scheme or u.scheme == 'redis':
         return {
             'redis_host': u.netloc.split('@')[-1],
-            'redis_password': u.password or '',
+            'redis_password': '' if u.password is None else unquote(u.password),
             'redis_db_index_reg': u.path and int(u.path[1:]) or 0,
         }
     elif u.scheme == 'redis+sentinel':
         return {
             'sentinel_master_set': u.path.split('/')[1],
             'redis_host': u.netloc.split('@')[-1],
-            'redis_password': u.password or '',
+            'redis_password': '' if u.password is None else unquote(u.password),
             'redis_db_index_reg': len(u.path.split('/')) == 3 and int(u.path.split('/')[2]) or 0,
         }
     else:

diff --git a/make/photon/registry/Dockerfile.binary b/make/photon/registry/Dockerfile.binary
@@ -1,4 +1,4 @@
-FROM golang:1.19.3
+FROM goharbor/golang:1.20.7
 
 ENV DISTRIBUTION_DIR /go/src/github.com/docker/distribution
 ENV BUILDTAGS include_oss include_gcs

diff --git a/make/photon/registry/builder b/make/photon/registry/builder
@@ -22,12 +22,6 @@ cur=$PWD
 TEMP=`mktemp -d ${TMPDIR-/tmp}/distribution.XXXXXX`
 git clone -b $VERSION https://github.com/distribution/distribution.git $TEMP
 
-# add patch 2815
-echo 'add patch https://github.com/distribution/distribution/pull/2815 ...'
-cd $TEMP
-wget https://github.com/distribution/distribution/pull/2815.patch
-git apply 2815.patch
-
 # add patch redis
 cd $TEMP
 git apply $cur/redis.patch

diff --git a/make/photon/trivy-adapter/Dockerfile.binary b/make/photon/trivy-adapter/Dockerfile.binary
@@ -1,4 +1,4 @@
-FROM golang:1.19.3
+FROM goharbor/golang:1.20.7
 
 ADD .   /go/src/github.com/aquasecurity/harbor-scanner-trivy/
 WORKDIR /go/src/github.com/aquasecurity/harbor-scanner-trivy/

diff --git a/make/photon/trivy-adapter/builder.sh b/make/photon/trivy-adapter/builder.sh
@@ -19,7 +19,7 @@ TEMP=$(mktemp -d ${TMPDIR-/tmp}/trivy-adapter.XXXXXX)
 git clone https://github.com/aquasecurity/harbor-scanner-trivy.git $TEMP
 cd $TEMP; git checkout $VERSION; cd -
 
-echo "Building Trivy adapter binary based on golang:1.19.3..."
+echo "Building Trivy adapter binary based on goharbor/golang:1.20.7..."
 cp Dockerfile.binary $TEMP
 docker build -f $TEMP/Dockerfile.binary -t trivy-adapter-golang $TEMP
 

diff --git a/src/.golangci.yaml b/src/.golangci.yaml
@@ -34,7 +34,6 @@ linters:
     - revive
     - whitespace
     - bodyclose
-    # - deadcode //deprecated since golangci-lint v1.49.0
     - errcheck
     # - gosec
     - gosimple
@@ -43,12 +42,10 @@ linters:
     # - noctx
     # - rowserrcheck
     - staticcheck
-    # - structcheck //deprecated since golangci-lint v1.49.0
     - stylecheck
     # - unconvert
     # - unparam
     # - unused  // disabled due to too many false positive check and limited support golang 1.19 https://github.com/dominikh/go-tools/issues/1282
-    # - varcheck //deprecated since golangci-lint v1.49.0
 
 run:
   skip-files:

diff --git a/src/chartserver/base_test.go b/src/chartserver/base_test.go
diff --git a/src/chartserver/cache.go b/src/chartserver/cache.go
diff --git a/src/chartserver/cache_test.go b/src/chartserver/cache_test.go
diff --git a/src/chartserver/chart_operator.go b/src/chartserver/chart_operator.go
diff --git a/src/chartserver/chart_operator_test.go b/src/chartserver/chart_operator_test.go
diff --git a/src/chartserver/client.go b/src/chartserver/client.go
diff --git a/src/chartserver/controller.go b/src/chartserver/controller.go
diff --git a/src/chartserver/controller_test.go b/src/chartserver/controller_test.go
diff --git a/src/chartserver/handler_interface.go b/src/chartserver/handler_interface.go
diff --git a/src/chartserver/handler_manipulation.go b/src/chartserver/handler_manipulation.go
diff --git a/src/chartserver/handler_manipulation_test.go b/src/chartserver/handler_manipulation_test.go
diff --git a/src/chartserver/handler_proxy_traffic.go b/src/chartserver/handler_proxy_traffic.go
diff --git a/src/chartserver/handler_proxy_traffic_test.go b/src/chartserver/handler_proxy_traffic_test.go
diff --git a/src/chartserver/handler_repo.go b/src/chartserver/handler_repo.go
diff --git a/src/chartserver/handler_repo_test.go b/src/chartserver/handler_repo_test.go
diff --git a/src/chartserver/handler_utility.go b/src/chartserver/handler_utility.go
diff --git a/src/chartserver/handler_utility_test.go b/src/chartserver/handler_utility_test.go
diff --git a/src/chartserver/redis_sentinel.go b/src/chartserver/redis_sentinel.go
diff --git a/src/chartserver/reverse_proxy.go b/src/chartserver/reverse_proxy.go
diff --git a/src/chartserver/reverse_proxy_test.go b/src/chartserver/reverse_proxy_test.go
diff --git a/src/chartserver/utils.go b/src/chartserver/utils.go
diff --git a/src/chartserver/utils_test.go b/src/chartserver/utils_test.go