diff --git a/packages/artifactory-jcr/artifactory-jcr.patch b/packages/artifactory-jcr/artifactory-jcr.patch
new file mode 100644
index 000000000..90b6d8941
--- /dev/null
+++ b/packages/artifactory-jcr/artifactory-jcr.patch
@@ -0,0 +1,11 @@
+diff -x '*.tgz' -x '*.lock' -uNr packages/artifactory-jcr/charts-original/Chart.yaml packages/artifactory-jcr/charts/Chart.yaml
+--- packages/artifactory-jcr/charts-original/Chart.yaml
++++ packages/artifactory-jcr/charts/Chart.yaml
+@@ -27,3 +27,7 @@
+ sources:
+ - https://github.com/jfrog/charts
+ version: 2.5.1
++annotations:
++  catalog.cattle.io/certified: partner
++  catalog.cattle.io/namespace: artifactory-jcr
++  catalog.cattle.io/release-name: artifactory-jcr
diff --git a/packages/artifactory-jcr/overlay/app-readme.md b/packages/artifactory-jcr/overlay/app-readme.md
new file mode 100644
index 000000000..9d9b7d85f
--- /dev/null
+++ b/packages/artifactory-jcr/overlay/app-readme.md
@@ -0,0 +1,18 @@
+# JFrog Container Registry Helm Chart
+
+Universal Repository Manager supporting all major packaging formats, build tools and CI servers.
+
+## Chart Details
+This chart will do the following:
+
+* Deploy JFrog Container Registry
+* Deploy an optional Nginx server
+* Optionally expose Artifactory with Ingress [Ingress documentation](https://kubernetes.io/docs/concepts/services-networking/ingress/)
+
+
+## Useful links
+Blog: [Herd Trust Into Your Rancher Labs Multi-Cloud Strategy with Artifactory](https://jfrog.com/blog/herd-trust-into-your-rancher-labs-multi-cloud-strategy-with-artifactory/)
+
+## Activate Your Artifactory Instance 
+Don't have a license? Please send an email to [rancher-jfrog-licenses@jfrog.com](mailto:rancher-jfrog-licenses@jfrog.com) to get it.
+
diff --git a/packages/artifactory-jcr/overlay/questions.yml b/packages/artifactory-jcr/overlay/questions.yml
new file mode 100644
index 000000000..9cde42870
--- /dev/null
+++ b/packages/artifactory-jcr/overlay/questions.yml
@@ -0,0 +1,271 @@
+questions:
+# Advance Settings
+- variable: artifactory.artifactory.masterKey
+  default: "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
+  description: "Artifactory master key. For security reasons, we strongly recommend you generate your own master key using this command: 'openssl rand -hex 32'"
+  type: string
+  label: Artifactory master key
+  group: "Security Settings"
+
+# Container Images
+- variable: defaultImage
+  default: true
+  description: "Use default Docker image"
+  label: Use Default Image
+  type: boolean
+  show_subquestion_if: false
+  group: "Container Images"
+  subquestions:
+  - variable: artifactory.artifactory.image.repository
+    default: "docker.bintray.io/jfrog/artifactory-jcr"
+    description: "JFrog Container Registry image name"
+    type: string
+    label: JFrog Container Registry Image Name
+  - variable: artifactory.artifactory.image.version
+    default: "7.6.3"
+    description: "JFrog Container Registry image tag"
+    type: string
+    label: JFrog Container Registry Image Tag
+  - variable: artifactory.imagePullSecrets
+    description: "Image Pull Secret"
+    type: string
+    label: Image Pull Secret
+
+# Services and LoadBalancing Settings
+- variable: artifactory.ingress.enabled
+  default: false
+  description: "Expose app using Layer 7 Load Balancer - ingress"
+  type: boolean
+  label: Expose app using Layer 7 Load Balancer
+  show_subquestion_if: true
+  group: "Services and Load Balancing"
+  required: true
+  subquestions:
+  - variable: artifactory.ingress.hosts[0]
+    default: "xip.io"
+    description: "Hostname to your artifactory installation"
+    type: hostname
+    required: true
+    label: Hostname
+
+# Nginx Settings
+- variable: artifactory.nginx.enabled
+  default: true
+  description: "Enable nginx server"
+  type: boolean
+  label: Enable Nginx Server
+  group: "Services and Load Balancing"
+  required: true
+  show_if: "artifactory.ingress.enabled=false"
+- variable: artifactory.nginx.service.type
+  default: "LoadBalancer"
+  description: "Nginx service type"
+  type: enum
+  required: true
+  label: Nginx Service Type
+  show_if: "artifactory.nginx.enabled=true&&artifactory.ingress.enabled=false"
+  group: "Services and Load Balancing"
+  options:
+  - "ClusterIP"
+  - "NodePort"
+  - "LoadBalancer"
+- variable: artifactory.nginx.service.loadBalancerIP
+  default: ""
+  description: "Provide Static IP to configure with Nginx"
+  type: string
+  label: Config Nginx LoadBalancer IP
+  show_if: "artifactory.nginx.enabled=true&&artifactory.nginx.service.type=LoadBalancer&&artifactory.ingress.enabled=false"
+  group: "Services and Load Balancing"
+- variable: artifactory.nginx.tlsSecretName
+  default: ""
+  description: "Provide SSL Secret name to configure with Nginx"
+  type: string
+  label: Config Nginx SSL Secret
+  show_if: "artifactory.nginx.enabled=true&&artifactory.ingress.enabled=false"
+  group: "Services and Load Balancing"
+- variable: artifactory.nginx.customArtifactoryConfigMap
+  default: ""
+  description: "Provide configMap name to configure Nginx with custom `artifactory.conf`"
+  type: string
+  label: ConfigMap for Nginx Artifactory Config
+  show_if: "artifactory.nginx.enabled=true&&artifactory.ingress.enabled=false"
+  group: "Services and Load Balancing"
+
+# Database Settings
+- variable: artifactory.postgresql.enabled
+  default: true
+  description: "Enable PostgreSQL"
+  type: boolean
+  required: true
+  label: Enable PostgreSQL
+  group: "Database Settings"
+  show_subquestion_if: true
+  subquestions:
+  - variable: artifactory.postgresql.postgresqlPassword
+    default: ""
+    description: "PostgreSQL password"
+    type: password
+    required: true
+    label: PostgreSQL Password
+    group: "Database Settings"
+    show_if: "artifactory.postgresql.enabled=true"
+  - variable: artifactory.postgresql.persistence.size
+    default: 20Gi
+    description: "PostgreSQL persistent volume size"
+    type: string
+    label: PostgreSQL Persistent Volume Size
+    show_if: "artifactory.postgresql.enabled=true"
+  - variable: artifactory.postgresql.persistence.storageClass
+    default: ""
+    description: "If undefined or null, uses the default StorageClass. Default to null"
+    type: storageclass
+    label: Default StorageClass for PostgreSQL
+    show_if: "artifactory.postgresql.enabled=true"
+  - variable: artifactory.postgresql.resources.requests.cpu
+    default: "200m"
+    description: "PostgreSQL initial cpu request"
+    type: string
+    label: PostgreSQL Initial CPU Request
+    show_if: "artifactory.postgresql.enabled=true"
+  - variable: artifactory.postgresql.resources.requests.memory
+    default: "500Mi"
+    description: "PostgreSQL initial memory request"
+    type: string
+    label: PostgreSQL Initial Memory Request
+    show_if: "artifactory.postgresql.enabled=true"
+  - variable: artifactory.postgresql.resources.limits.cpu
+    default: "1"
+    description: "PostgreSQL cpu limit"
+    type: string
+    label: PostgreSQL CPU Limit
+    show_if: "artifactory.postgresql.enabled=true"
+  - variable: artifactory.postgresql.resources.limits.memory
+    default: "1Gi"
+    description: "PostgreSQL memory limit"
+    type: string
+    label: PostgreSQL Memory Limit
+    show_if: "artifactory.postgresql.enabled=true"
+- variable: artifactory.database.type
+  default: "postgresql"
+  description: "xternal database type (postgresql, mysql, oracle or mssql)"
+  type: enum
+  required: true
+  label: External Database Type
+  group: "Database Settings"
+  show_if: "artifactory.postgresql.enabled=false"
+  options:
+    - "postgresql"
+    - "mysql"
+    - "oracle"
+    - "mssql"
+- variable: artifactory.database.url
+  default: ""
+  description: "External database URL. If you set the url, leave host and port empty"
+  type: string
+  label: External Database URL
+  group: "Database Settings"
+  show_if: "artifactory.postgresql.enabled=false"
+- variable: artifactory.database.host
+  default: ""
+  description: "External database hostname"
+  type: string
+  label: External Database Hostname
+  group: "Database Settings"
+  show_if: "artifactory.postgresql.enabled=false"
+- variable: artifactory.database.port
+  default: ""
+  description: "External database port"
+  type: string
+  label: External Database Port
+  group: "Database Settings"
+  show_if: "artifactory.postgresql.enabled=false"
+- variable: artifactory.database.user
+  default: ""
+  description: "External database username"
+  type: string
+  label: External Database Username
+  group: "Database Settings"
+  show_if: "artifactory.postgresql.enabled=false"
+- variable: artifactory.database.password
+  default: ""
+  description: "External database password"
+  type: password
+  label: External Database Password
+  group: "Database Settings"
+  show_if: "artifactory.postgresql.enabled=false"
+
+# Advance Settings
+- variable: artifactory.advancedOptions
+  default: false
+  description: "Show advanced configurations"
+  label: Show Advanced Configurations
+  type: boolean
+  show_subquestion_if: true
+  group: "Advanced Options"
+  subquestions:
+  - variable: artifactory.artifactory.primary.resources.requests.cpu
+    default: "500m"
+    description: "Artifactory primary node initial cpu request"
+    type: string
+    label: Artifactory Primary Node Initial CPU Request
+  - variable: artifactory.artifactory.primary.resources.requests.memory
+    default: "1Gi"
+    description: "Artifactory primary node initial memory request"
+    type: string
+    label: Artifactory Primary Node Initial Memory Request
+  - variable: artifactory.artifactory.primary.javaOpts.xms
+    default: "1g"
+    description: "Artifactory primary node java Xms size"
+    type: string
+    label: Artifactory Primary Node Java Xms Size
+  - variable: artifactory.artifactory.primary.resources.limits.cpu
+    default: "2"
+    description: "Artifactory primary node cpu limit"
+    type: string
+    label: Artifactory Primary Node CPU Limit
+  - variable: artifactory.artifactory.primary.resources.limits.memory
+    default: "4Gi"
+    description: "Artifactory primary node memory limit"
+    type: string
+    label: Artifactory Primary Node Memory Limit
+  - variable: artifactory.artifactory.primary.javaOpts.xmx
+    default: "4g"
+    description: "Artifactory primary node java Xmx size"
+    type: string
+    label: Artifactory Primary Node Java Xmx Size
+  - variable: artifactory.artifactory.node.resources.requests.cpu
+    default: "500m"
+    description: "Artifactory member node initial cpu request"
+    type: string
+    label: Artifactory Member Node Initial CPU Request
+  - variable: artifactory.artifactory.node.resources.requests.memory
+    default: "2Gi"
+    description: "Artifactory member node initial memory request"
+    type: string
+    label: Artifactory Member Node Initial Memory Request
+  - variable: artifactory.artifactory.node.javaOpts.xms
+    default: "1g"
+    description: "Artifactory member node java Xms size"
+    type: string
+    label: Artifactory Member Node Java Xms Size
+  - variable: artifactory.artifactory.node.resources.limits.cpu
+    default: "2"
+    description: "Artifactory member node cpu limit"
+    type: string
+    label: Artifactory Member Node CPU Limit
+  - variable: artifactory.artifactory.node.resources.limits.memory
+    default: "4Gi"
+    description: "Artifactory member node memory limit"
+    type: string
+    label: Artifactory Member Node Memory Limit
+  - variable: artifactory.artifactory.node.javaOpts.xmx
+    default: "4g"
+    description: "Artifactory member node java Xmx size"
+    type: string
+    label: Artifactory Member Node Java Xmx Size
+
+# Internal Settings
+- variable: installerInfo
+  default: '\{\"productId\": \"RancherHelm_artifactory-jcr/7.6.3\", \"features\": \[\{\"featureId\": \"Partner/ACC-007246\"\}\]\}'
+  type: string
+  group: "Internal Settings (Do not modify)"
diff --git a/packages/artifactory-jcr/package.yaml b/packages/artifactory-jcr/package.yaml
new file mode 100644
index 000000000..175cf8e6a
--- /dev/null
+++ b/packages/artifactory-jcr/package.yaml
@@ -0,0 +1,2 @@
+url: https://repo.chartcenter.io/jfrog/artifactory-jcr-2.5.1.tgz
+packageVersion: 00