Repository: kyverno/kyverno
Pull request #1175 (2020-10-07 18:13:11)

migrate github.com/nirmata/kyverno to github.com/kyverno/kyverno


Patch:
diff --git a/.goreleaser.yml b/.goreleaser.yml
index 3bdc00c49..463a384a5 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -9,7 +9,7 @@ builds:
   env:
   - CGO_ENABLED=0
   ldflags:
-  - -s -w -X github.com/nirmata/kyverno/pkg/version.BuildVersion={{.Version}} -X github.com/nirmata/kyverno/pkg/version.BuildHash={{ .FullCommit }} -X github.com/nirmata/kyverno/pkg/version.BuildTime={{ .Date }}
+  - -s -w -X github.com/kyverno/kyverno/pkg/version.BuildVersion={{.Version}} -X github.com/kyverno/kyverno/pkg/version.BuildHash={{ .FullCommit }} -X github.com/kyverno/kyverno/pkg/version.BuildTime={{ .Date }}
   goos:
     - linux
     - darwin
diff --git a/.krew.yaml b/.krew.yaml
index 02953fff5..4a51deabd 100644
--- a/.krew.yaml
+++ b/.krew.yaml
@@ -10,7 +10,7 @@ spec:
         matchLabels:
           os: linux
           arch: amd64
-      {{addURIAndSha "https://github.com/nirmata/kyverno/releases/download/{{ .TagName }}/kyverno-cli_{{ .TagName }}_linux_x86_64.tar.gz" .TagName | indent 6 }}
+      {{addURIAndSha "https://github.com/kyverno/kyverno/releases/download/{{ .TagName }}/kyverno-cli_{{ .TagName }}_linux_x86_64.tar.gz" .TagName | indent 6 }}
       files:
         - from: kyverno
           to: .
@@ -21,7 +21,7 @@ spec:
         matchLabels:
           os: darwin
           arch: amd64
-      {{addURIAndSha "https://github.com/nirmata/kyverno/releases/download/{{ .TagName }}/kyverno-cli_{{ .TagName }}_darwin_x86_64.tar.gz" .TagName | indent 6 }}
+      {{addURIAndSha "https://github.com/kyverno/kyverno/releases/download/{{ .TagName }}/kyverno-cli_{{ .TagName }}_darwin_x86_64.tar.gz" .TagName | indent 6 }}
       files:
         - from: kyverno
           to: .
@@ -32,7 +32,7 @@ spec:
         matchLabels:
           os: windows
           arch: amd64
-      {{addURIAndSha "https://github.com/nirmata/kyverno/releases/download/{{ .TagName }}/kyverno-cli_{{ .TagName }}_windows_x86_64.zip" .TagName | indent 6 }}
+      {{addURIAndSha "https://github.com/kyverno/kyverno/releases/download/{{ .TagName }}/kyverno-cli_{{ .TagName }}_windows_x86_64.zip" .TagName | indent 6 }}
       files:
         - from: kyverno.exe
           to: .
diff --git a/Makefile b/Makefile
index 90e404b13..a630859bd 100644
--- a/Makefile
+++ b/Makefile
@@ -176,7 +176,7 @@ kustomize-crd:
 	# Generate install_debug.yaml that for developer testing
 	kustomize build ./definitions/debug > ./definitions/install_debug.yaml
 
-# guidance https://github.com/nirmata/kyverno/wiki/Generate-a-Release
+# guidance https://github.com/kyverno/kyverno/wiki/Generate-a-Release
 release: 
 	kustomize build ./definitions > ./definitions/install.yaml
 	kustomize build ./definitions > ./definitions/release/install.yaml
diff --git a/README.md b/README.md
index c93beb9ce..e880ecbbe 100644
--- a/README.md
+++ b/README.md
@@ -28,7 +28,7 @@ Install Kyverno:
 kubectl create -f https://raw.githubusercontent.com/nirmata/kyverno/master/definitions/release/install.yaml
 ```
 
-You can also install Kyverno using a [Helm chart](https://github.com/nirmata/kyverno/blob/master/documentation/installation.md#install-kyverno-using-helm).
+You can also install Kyverno using a [Helm chart](https://github.com/kyverno/kyverno/blob/master/documentation/installation.md#install-kyverno-using-helm).
 
 Add the policy below. It contains a single validation rule that requires that all pods have 
 a `app.kubernetes.io/name` label. Kyverno supports different rule types to validate, 
@@ -96,10 +96,10 @@ Clean up by deleting all cluster policies:
 kubectl delete cpol --all
 ```
 
-As a next step, browse the [sample policies](https://github.com/nirmata/kyverno/blob/master/samples/README.md) 
-and learn about [writing policies](https://github.com/nirmata/kyverno/blob/master/documentation/writing-policies.md). 
-You can test policies using the [Kyverno cli](https://github.com/nirmata/kyverno/blob/master/documentation/kyverno-cli.md). 
-See [docs](https://github.com/nirmata/kyverno/#documentation) for complete details.
+As a next step, browse the [sample policies](https://github.com/kyverno/kyverno/blob/master/samples/README.md) 
+and learn about [writing policies](https://github.com/kyverno/kyverno/blob/master/documentation/writing-policies.md). 
+You can test policies using the [Kyverno cli](https://github.com/kyverno/kyverno/blob/master/documentation/kyverno-cli.md). 
+See [docs](https://github.com/kyverno/kyverno/#documentation) for complete details.
 
 ## Documentation
 
@@ -118,11 +118,11 @@ See [docs](https://github.com/nirmata/kyverno/#documentation) for complete detai
 - [Policy Violations](documentation/policy-violations.md)
 - [Kyverno CLI](documentation/kyverno-cli.md)
 - [Sample Policies](/samples/README.md)
-- [API Documentation](https://htmlpreview.github.io/?https://github.com/nirmata/kyverno/blob/master/documentation/index.html)
+- [API Documentation](https://htmlpreview.github.io/?https://github.com/kyverno/kyverno/blob/master/documentation/index.html)
 
 ## License
 
-[Apache License 2.0](https://github.com/nirmata/kyverno/blob/master/LICENSE)
+[Apache License 2.0](https://github.com/kyverno/kyverno/blob/master/LICENSE)
 
 ## Community
 
@@ -132,7 +132,7 @@ To attend our next monthly community meeting join the [Kyverno group](https://gr
 
 ### Getting Help
 
-- For feature requests and bugs, file an [issue](https://github.com/nirmata/kyverno/issues).
+- For feature requests and bugs, file an [issue](https://github.com/kyverno/kyverno/issues).
 - For discussions or questions, join the **#kyverno** channel on the [Kubernetes Slack](https://kubernetes.slack.com/) or the [mailing list](https://groups.google.com/g/kyverno).
 
 ### Contributing
@@ -141,8 +141,8 @@ Thanks for your interest in contributing!
 
 - Please review and agree to abide with the [Code of Conduct](/CODE_OF_CONDUCT.md) before contributing.
 - We encourage all contributions and encourage you to read our [contribution guidelines](./CONTRIBUTING.md).
-- See the [Wiki](https://github.com/nirmata/kyverno/wiki) for developer documentation.
-- Browse through the [open issues](https://github.com/nirmata/kyverno/issues)
+- See the [Wiki](https://github.com/kyverno/kyverno/wiki) for developer documentation.
+- Browse through the [open issues](https://github.com/kyverno/kyverno/issues)
 
 ## Presentations and Articles
 
@@ -175,5 +175,5 @@ Tools like [Kustomize](https://github.com/kubernetes-sigs/kustomize) can be used
 
 ## Roadmap
 
-See [Milestones](https://github.com/nirmata/kyverno/milestones) and [Issues](https://github.com/nirmata/kyverno/issues).
+See [Milestones](https://github.com/kyverno/kyverno/milestones) and [Issues](https://github.com/kyverno/kyverno/issues).
 
diff --git a/charts/kyverno/Chart.yaml b/charts/kyverno/Chart.yaml
index 57f236c8d..3606ac9c9 100644
--- a/charts/kyverno/Chart.yaml
+++ b/charts/kyverno/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 name: kyverno
 version: 1.1.12
 appVersion: v1.1.12
-icon: https://github.com/nirmata/kyverno/blob/master/documentation/images/Kyverno_Horizontal.png
+icon: https://github.com/kyverno/kyverno/blob/master/documentation/images/Kyverno_Horizontal.png
 description: Kubernetes Native Policy Management
 keywords:
   - kubernetes
diff --git a/charts/kyverno/README.md b/charts/kyverno/README.md
index b84617b4c..c13fec3e3 100644
--- a/charts/kyverno/README.md
+++ b/charts/kyverno/README.md
@@ -57,7 +57,7 @@ Parameter | Description | Default
 `affinity` | node/pod affinities | `nil`
 `createSelfSignedCert` | generate a self signed cert and certificate authority. Kyverno defaults to using kube-controller-manager CA-signed certificate or existing cert secret if false. | `false`
 `config.existingConfig` | existing Kubernetes configmap to use for the resource filters configuration | `nil`
-`config.resourceFilters` | list of filter of resource types to be skipped by kyverno policy engine. See [documentation](https://github.com/nirmata/kyverno/blob/master/documentation/installation.md#filter-kubernetes-resources-that-admission-webhook-should-not-process) for details | `["[Event,*,*]","[*,kube-system,*]","[*,kube-public,*]","[*,kube-node-lease,*]","[Node,*,*]","[APIService,*,*]","[TokenReview,*,*]","[SubjectAccessReview,*,*]","[*,kyverno,*]"]`
+`config.resourceFilters` | list of filter of resource types to be skipped by kyverno policy engine. See [documentation](https://github.com/kyverno/kyverno/blob/master/documentation/installation.md#filter-kubernetes-resources-that-admission-webhook-should-not-process) for details | `["[Event,*,*]","[*,kube-system,*]","[*,kube-public,*]","[*,kube-node-lease,*]","[Node,*,*]","[APIService,*,*]","[TokenReview,*,*]","[SubjectAccessReview,*,*]","[*,kyverno,*]"]`
 `extraArgs` | list of extra arguments to give the binary | `[]`
 `fullnameOverride` | override the expanded name of the chart | `nil`
 `generatecontrollerExtraResources` | extra resource type Kyverno is allowed to generate | `[]`
@@ -107,6 +107,6 @@ $ helm install --namespace kyverno kyverno ./charts/kyverno -f values.yaml
 
 ## TLS Configuration
 
-If `createSelfSignedCert` is `true`, Helm will take care of the steps of creating an external self-signed certificate describe in option 2 of the [installation documentation](https://github.com/nirmata/kyverno/blob/master/documentation/installation.md#option-2-use-your-own-ca-signed-certificate)
+If `createSelfSignedCert` is `true`, Helm will take care of the steps of creating an external self-signed certificate describe in option 2 of the [installation documentation](https://github.com/kyverno/kyverno/blob/master/documentation/installation.md#option-2-use-your-own-ca-signed-certificate)
 
 If `createSelfSignedCert` is `false`, Kyverno will generate a pair using the kube-controller-manager., or you can provide your own TLS CA and signed-key pair and create the secret yourself as described in the documentation.
diff --git a/cmd/cli/kubectl-kyverno/main.go b/cmd/cli/kubectl-kyverno/main.go
index a5adfa5a9..3b85f44e9 100644
--- a/cmd/cli/kubectl-kyverno/main.go
+++ b/cmd/cli/kubectl-kyverno/main.go
@@ -1,7 +1,7 @@
 package main
 
 import (
-	"github.com/nirmata/kyverno/pkg/kyverno"
+	"github.com/kyverno/kyverno/pkg/kyverno"
 )
 
 func main() {
diff --git a/cmd/initContainer/main.go b/cmd/initContainer/main.go
index 24fc50743..c88b89e25 100644
--- a/cmd/initContainer/main.go
+++ b/cmd/initContainer/main.go
@@ -10,10 +10,10 @@ import (
 	"sync"
 	"time"
 
-	"github.com/nirmata/kyverno/pkg/config"
-	client "github.com/nirmata/kyverno/pkg/dclient"
-	"github.com/nirmata/kyverno/pkg/signal"
-	"github.com/nirmata/kyverno/pkg/utils"
+	"github.com/kyverno/kyverno/pkg/config"
+	client "github.com/kyverno/kyverno/pkg/dclient"
+	"github.com/kyverno/kyverno/pkg/signal"
+	"github.com/kyverno/kyverno/pkg/utils"
 	"k8s.io/apimachinery/pkg/api/errors"
 	rest "k8s.io/client-go/rest"
 	clientcmd "k8s.io/client-go/tools/clientcmd"
@@ -60,7 +60,7 @@ func main() {
 	}
 
 	// Exit for unsupported version of kubernetes cluster
-	// https://github.com/nirmata/kyverno/issues/700
+	// https://github.com/kyverno/kyverno/issues/700
 	// - supported from v1.12.7+
 	if !utils.HigherThanKubernetesVersion(client, log.Log, 1, 12, 7) {
 		os.Exit(1)
diff --git a/cmd/kyverno/main.go b/cmd/kyverno/main.go
index c7209a72c..e977b82c4 100644
--- a/cmd/kyverno/main.go
+++ b/cmd/kyverno/main.go
@@ -9,27 +9,27 @@ import (
 	"os"
 	"time"
 
-	"github.com/nirmata/kyverno/pkg/openapi"
-	"github.com/nirmata/kyverno/pkg/policycache"
-
-	"github.com/nirmata/kyverno/pkg/checker"
-	kyvernoclient "github.com/nirmata/kyverno/pkg/client/clientset/versioned"
-	kyvernoinformer "github.com/nirmata/kyverno/pkg/client/informers/externalversions"
-	"github.com/nirmata/kyverno/pkg/config"
-	dclient "github.com/nirmata/kyverno/pkg/dclient"
-	event "github.com/nirmata/kyverno/pkg/event"
-	"github.com/nirmata/kyverno/pkg/generate"
-	generatecleanup "github.com/nirmata/kyverno/pkg/generate/cleanup"
-	"github.com/nirmata/kyverno/pkg/policy"
-	"github.com/nirmata/kyverno/pkg/policystatus"
-	"github.com/nirmata/kyverno/pkg/policyviolation"
-	"github.com/nirmata/kyverno/pkg/resourcecache"
-	"github.com/nirmata/kyverno/pkg/signal"
-	"github.com/nirmata/kyverno/pkg/utils"
-	"github.com/nirmata/kyverno/pkg/version"
-	"github.com/nirmata/kyverno/pkg/webhookconfig"
-	"github.com/nirmata/kyverno/pkg/webhooks"
-	webhookgenerate "github.com/nirmata/kyverno/pkg/webhooks/generate"
+	"github.com/kyverno/kyverno/pkg/openapi"
+	"github.com/kyverno/kyverno/pkg/policycache"
+
+	"github.com/kyverno/kyverno/pkg/checker"
+	kyvernoclient "github.com/kyverno/kyverno/pkg/client/clientset/versioned"
+	kyvernoinformer "github.com/kyverno/kyverno/pkg/client/informers/externalversions"
+	"github.com/kyverno/kyverno/pkg/config"
+	dclient "github.com/kyverno/kyverno/pkg/dclient"
+	event "github.com/kyverno/kyverno/pkg/event"
+	"github.com/kyverno/kyverno/pkg/generate"
+	generatecleanup "github.com/kyverno/kyverno/pkg/generate/cleanup"
+	"github.com/kyverno/kyverno/pkg/policy"
+	"github.com/kyverno/kyverno/pkg/policystatus"
+	"github.com/kyverno/kyverno/pkg/policyviolation"
+	"github.com/kyverno/kyverno/pkg/resourcecache"
+	"github.com/kyverno/kyverno/pkg/signal"
+	"github.com/kyverno/kyverno/pkg/utils"
+	"github.com/kyverno/kyverno/pkg/version"
+	"github.com/kyverno/kyverno/pkg/webhookconfig"
+	"github.com/kyverno/kyverno/pkg/webhooks"
+	webhookgenerate "github.com/kyverno/kyverno/pkg/webhooks/generate"
 	kubeinformers "k8s.io/client-go/informers"
 	"k8s.io/klog"
 	"k8s.io/klog/klogr"
@@ -71,7 +71,7 @@ func main() {
 		os.Exit(1)
 	}
 
-	// Generate CSR with CN as FQDN due to https://github.com/nirmata/kyverno/issues/542
+	// Generate CSR with CN as FQDN due to https://github.com/kyverno/kyverno/issues/542
 	flag.BoolVar(&fqdncn, "fqdn-as-cn", false, "use FQDN as Common Name in CSR")
 	flag.Parse()
 
diff --git a/documentation/installation.md b/documentation/installation.md
index efc85216c..bcaec57ad 100644
--- a/documentation/installation.md
+++ b/documentation/installation.md
@@ -36,7 +36,7 @@ Kyverno can request a CA signed certificate-key pair from `kube-controller-manag
 
 ```sh
 ## Install Kyverno
-kubectl create -f https://github.com/nirmata/kyverno/raw/master/definitions/install.yaml
+kubectl create -f https://github.com/kyverno/kyverno/raw/master/definitions/install.yaml
 ```
 
 This method requires that the kube-controller-manager is configured to act as a certificate signer. To verify that this option is enabled for your cluster, check the command-line args for the kube-controller-manager. If `--cluster-signing-cert-file` and `--cluster-signing-key-file` are passed to the controller manager with paths to your CA's key-pair, then you can proceed to install Kyverno using this method.
@@ -148,7 +148,7 @@ Kyverno uses secrets created above to setup TLS communication with the kube-apis
 You can now install kyverno by downloading and updating the [install.yaml], or using the command below (assumes that the namespace is **kyverno**):
 
 ```sh
-kubectl create -f https://github.com/nirmata/kyverno/raw/master/definitions/install.yaml
+kubectl create -f https://github.com/kyverno/kyverno/raw/master/definitions/install.yaml
 ```
 
 
@@ -317,7 +317,7 @@ To modify the `ConfigMap`, either directly edit the `ConfigMap` `init-config` in
 
 # Installing outside of the cluster (debug mode)
 
-To build Kyverno in a development environment see: https://github.com/nirmata/kyverno/wiki/Building
+To build Kyverno in a development environment see: https://github.com/kyverno/kyverno/wiki/Building
 
 To run controller in this mode you should prepare a TLS key/certificate pair for debug webhook, then start controller with kubeconfig and the server address.
 
@@ -330,4 +330,4 @@ To run controller in this mode you should prepare a TLS key/certificate pair for
 ---
 <small>*Read Next >> [Writing Policies](/documentation/writing-policies.md)*</small>
 
-[install.yaml]: https://github.com/nirmata/kyverno/raw/master/definitions/install.yaml
+[install.yaml]: https://github.com/kyverno/kyverno/raw/master/definitions/install.yaml
diff --git a/documentation/writing-policies-mutate.md b/documentation/writing-policies-mutate.md
index 52a68b209..0eee0d2e5 100644
--- a/documentation/writing-policies-mutate.md
+++ b/documentation/writing-policies-mutate.md
@@ -320,7 +320,7 @@ The anchor processing behavior for mutate conditions is as follows:
 
 ## Additional Details
 
-Additional details on mutation overlay behaviors are available on the wiki: [Mutation Overlay](https://github.com/nirmata/kyverno/wiki/Mutation-Overlay)
+Additional details on mutation overlay behaviors are available on the wiki: [Mutation Overlay](https://github.com/kyverno/kyverno/wiki/Mutation-Overlay)
 
 ---
 <small>*Read Next >> [Generate Resources](/documentation/writing-policies-generate.md)*</small>
diff --git a/go.mod b/go.mod
index d3edcf3c5..8946865bb 100644
--- a/go.mod
+++ b/go.mod
@@ -1,4 +1,4 @@
-module github.com/nirmata/kyverno
+module github.com/kyverno/kyverno
 
 go 1.13
 
diff --git a/pkg/api/kyverno/v1/register.go b/pkg/api/kyverno/v1/register.go
index 9a9323c77..ea9d34b59 100644
--- a/pkg/api/kyverno/v1/register.go
+++ b/pkg/api/kyverno/v1/register.go
@@ -5,7 +5,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 
-	"github.com/nirmata/kyverno/pkg/api/kyverno"
+	"github.com/kyverno/kyverno/pkg/api/kyverno"
 )
 
 // SchemeGroupVersion is group version used to register these objects
diff --git a/pkg/auth/auth.go b/pkg/auth/auth.go
index 9f63ac574..07a3ead77 100644
--- a/pkg/auth/auth.go
+++ b/pkg/auth/auth.go
@@ -5,7 +5,7 @@ import (
 	"reflect"
 
 	"github.com/go-logr/logr"
-	client "github.com/nirmata/kyverno/pkg/dclient"
+	client "github.com/kyverno/kyverno/pkg/dclient"
 	authorizationv1 "k8s.io/api/authorization/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime/schema"
diff --git a/pkg/checker/checker.go b/pkg/checker/checker.go
index 5cfc78970..0ab9c4dbc 100644
--- a/pkg/checker/checker.go
+++ b/pkg/checker/checker.go
@@ -6,9 +6,9 @@ import (
 	"time"
 
 	"github.com/go-logr/logr"
-	kyvernolister "github.com/nirmata/kyverno/pkg/client/listers/kyverno/v1"
-	dclient "github.com/nirmata/kyverno/pkg/dclient"
-	"github.com/nirmata/kyverno/pkg/event"
+	kyvernolister "github.com/kyverno/kyverno/pkg/client/listers/kyverno/v1"
+	dclient "github.com/kyverno/kyverno/pkg/dclient"
+	"github.com/kyverno/kyverno/pkg/event"
 	"k8s.io/apimachinery/pkg/labels"
 )
 
diff --git a/pkg/checker/status.go b/pkg/checker/status.go
index 497919164..6c1266172 100644
--- a/pkg/checker/status.go
+++ b/pkg/checker/status.go
@@ -5,9 +5,9 @@ import (
 	"strconv"
 
 	"github.com/go-logr/logr"
-	"github.com/nirmata/kyverno/pkg/config"
-	dclient "github.com/nirmata/kyverno/pkg/dclient"
-	"github.com/nirmata/kyverno/pkg/event"
+	"github.com/kyverno/kyverno/pkg/config"
+	dclient "github.com/kyverno/kyverno/pkg/dclient"
+	"github.com/kyverno/kyverno/pkg/event"
 )
 
 var deployName string = config.KubePolicyDeploymentName
diff --git a/pkg/client/clientset/versioned/clientset.go b/pkg/client/clientset/versioned/clientset.go
index 8aa7b0e52..f03faa0f5 100644
--- a/pkg/client/clientset/versioned/clientset.go
+++ b/pkg/client/clientset/versioned/clientset.go
@@ -21,7 +21,7 @@ package versioned
 import (
 	"fmt"
 
-	kyvernov1 "github.com/nirmata/kyverno/pkg/client/clientset/versioned/typed/kyverno/v1"
+	kyvernov1 "github.com/kyverno/kyverno/pkg/client/clientset/versioned/typed/kyverno/v1"
 	discovery "k8s.io/client-go/discovery"
 	rest "k8s.io/client-go/rest"
 	flowcontrol "k8s.io/client-go/util/flowcontrol"
diff --git a/pkg/client/clientset/versioned/fake/clientset_generated.go b/pkg/client/clientset/versioned/fake/clientset_generated.go
index c3264dcb6..f3ba28623 100644
--- a/pkg/client/clientset/versioned/fake/clientset_generated.go
+++ b/pkg/client/clientset/versioned/fake/clientset_generated.go
@@ -19,9 +19,9 @@ limitations under the License.
 package fake
 
 import (
-	clientset "github.com/nirmata/kyverno/pkg/client/clientset/versioned"
-	kyvernov1 "github.com/nirmata/kyverno/pkg/client/clientset/versioned/typed/kyverno/v1"
-	fakekyvernov1 "github.com/nirmata/kyverno/pkg/client/clientset/versioned/typed/kyverno/v1/fake"
+	clientset "github.com/kyverno/kyverno/pkg/client/clientset/versioned"
+	kyvernov1 "github.com/kyverno/kyverno/pkg/client/clientset/versioned/typed/kyverno/v1"
+	fakekyvernov1 "github.com/kyverno/kyverno/pkg/client/clientset/versioned/typed/kyverno/v1/fake"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/watch"
 	"k8s.io/client-go/discovery"
diff --git a/pkg/client/clientset/versioned/fake/register.go b/pkg/client/clientset/versioned/fake/register.go
index 4a90cf5ba..f750c85a2 100644
--- a/pkg/client/clientset/versioned/fake/register.go
+++ b/pkg/client/clientset/versioned/fake/register.go
@@ -19,7 +19,7 @@ limitations under the License.
 package fake
 
 import (
-	kyvernov1 "github.com/nirmata/kyverno/pkg/api/kyverno/v1"
+	kyvernov1 "github.com/kyverno/kyverno/pkg/api/kyverno/v1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	schema "k8s.io/apimachinery/pkg/runtime/schema"
diff --git a/pkg/client/clientset/versioned/scheme/register.go b/pkg/client/clientset/versioned/scheme/register.go
index 71ff505b5..6c12b8b1b 100644
--- a/pkg/client/clientset/versioned/scheme/register.go
+++ b/pkg/client/clientset/versioned/scheme/register.go
@@ -19,7 +19,7 @@ limitations under the License.
 package scheme
 
 import (
-	kyvernov1 "github.com/nirmata/kyverno/pkg/api/kyverno/v1"
+	kyvernov1 "github.com/kyverno/kyverno/pkg/api/kyverno/v1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	schema "k8s.io/apimachinery/pkg/runtime/schema"
diff --git a/pkg/client/clientset/versioned/typed/kyverno/v1/clusterpolicy.go b/pkg/client/clientset/versioned/typed/kyverno/v1/clusterpolicy.go
index fefa6feb1..1eba4b16b 100644
--- a/pkg/client/clientset/versioned/typed/kyverno/v1/clusterpolicy.go
+++ b/pkg/client/clientset/versioned/typed/kyverno/v1/clusterpolicy.go
@@ -21,8 +21,8 @@ package v1
 import (
 	"time"
 
-	v1 "github.com/nirmata/kyverno/pkg/api/kyverno/v1"
-	scheme "github.com/nirmata/kyverno/pkg/client/clientset/versioned/scheme"
+	v1 "github.com/kyverno/kyverno/pkg/api/kyverno/v1"
+	scheme "github.com/kyverno/kyverno/pkg/client/clientset/versioned/scheme"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	types "k8s.io/apimachinery/pkg/types"
 	watch "k8s.io/apimachinery/pkg/watch"
diff --git a/pkg/client/clientset/versioned/typed/kyverno/v1/clusterpolicyviolation.go b/pkg/client/clientset/versioned/typed/kyverno/v1/clusterpolicyviolation.go
index 12c803372..27246c30d 100644
--- a/pkg/client/clientset/versioned/typed/kyverno/v1/clusterpolicyviolation.go
+++ b/pkg/client/clientset/versioned/typed/kyverno/v1/clusterpolicyviolation.go
@@ -21,8 +21,8 @@ package v1
 import (
 	"time"
 
-	v1 "github.com/nirmata/kyverno/pkg/api/kyverno/v1"
-	scheme "github.com/nirmata/kyverno/pkg/client/clientset/versioned/scheme"
+	v1 "github.com/kyverno/kyverno/pkg/api/kyverno/v1"
+	scheme "github.com/kyverno/kyverno/pkg/client/clientset/versioned/scheme"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	types "k8s.io/apimachinery/pkg/types"
 	watch "k8s.io/apimachinery/pkg/watch"
diff --git a/pkg/client/clientset/versioned/typed/kyverno/v1/fake/fake_clusterpolicy.go b/pkg/client/clientset/versioned/typed/kyverno/v1/fake/fake_clusterpolicy.go
index 357c0e247..dcca705f1 100644
--- a/pkg/client/clientset/versioned/typed/kyverno/v1/fake/fake_clusterpolicy.go
+++ b/pkg/client/clientset/versioned/typed/kyverno/v1/fake/fake_clusterpolicy.go
@@ -19,7 +19,7 @@ limitations under the License.
 package fake
 
 import (
-	kyvernov1 "github.com/nirmata/kyverno/pkg/api/kyverno/v1"
+	kyvernov1 "github.com/kyverno/kyverno/pkg/api/kyverno/v1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	labels "k8s.io/apimachinery/pkg/labels"
 	schema "k8s.io/apimachinery/pkg/runtime/schema"
diff --git a/pkg/client/clientset/versioned/typed/kyverno/v1/fake/fake_clusterpolicyviolation.go b/pkg/client/clientset/versioned/typed/kyverno/v1/fake/fake_clusterpolicyviolation.go
index 782579abf..bf5f2f6f6 100644
--- a/pkg/client/clientset/versioned/typed/kyverno/v1/fake/fake_clusterpolicyviolation.go
+++ b/pkg/client/clientset/versioned/typed/kyverno/v1/fake/fake_clusterpolicyviolation.go
@@ -19,7 +19,7 @@ limitations under the License.
 package fake
 
 import (
-	kyvernov1 "github.com/nirmata/kyverno/pkg/api/kyverno/v1"
+	kyvernov1 "github.com/kyverno/kyverno/pkg/api/kyverno/v1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	labels "k8s.io/apimachinery/pkg/labels"
 	schema "k8s.io/apimachinery/pkg/runtime/schema"
diff --git a/pkg/client/clientset/versioned/typed/kyverno/v1/fake/fake_generaterequest.go b/pkg/client/clientset/versioned/typed/kyverno/v1/fake/fake_generaterequest.go
index 4cf4c9270..8a5bec748 100644
--- a/pkg/client/clientset/versioned/typed/kyverno/v1/fake/fake_generaterequest.go
+++ b/pkg/client/clientset/versioned/typed/kyverno/v1/fake/fake_generaterequest.go
@@ -19,7 +19,7 @@ limitations under the License.
 package fake
 
 import (
-	kyvernov1 "github.com/nirmata/kyverno/pkg/api/kyverno/v1"
+	kyvernov1 "github.com/kyverno/kyverno/pkg/api/kyverno/v1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	labels "k8s.io/apimachinery/pkg/labels"
 	schema "k8s.io/apimachinery/pkg/runtime/schema"
diff --git a/pkg/client/clientset/versioned/typed/kyverno/v1/fake/fake_kyverno_client.go b/pkg/client/clientset/versioned/typed/kyverno/v1/fake/fake_kyverno_client.go
index 044fcd720..6042bdbfe 100644
--- a/pkg/client/clientset/versioned/typed/kyverno/v1/fake/fake_kyverno_client.go
+++ b/pkg/client/clientset/versioned/typed/kyverno/v1/fake/fake_kyverno_client.go
@@ -19,7 +19,7 @@ limitations under the License.
 package fake
 
 import (
-	v1 "github.com/nirmata/kyverno/pkg/client/clientset/versioned/typed/kyverno/v1"
+	v1 "github.com/kyverno/kyverno/pkg/client/clientset/versioned/typed/kyverno/v1"
 	rest "k8s.io/client-go/rest"
 	testing "k8s.io/client-go/testing"
 )
diff --git a/pkg/client/clientset/versioned/typed/kyverno/v1/fake/fake_policy.go b/pkg/client/clientset/versioned/typed/kyverno/v1/fake/fake_policy.go
index 8b939055c..ef12ef858 100644
--- a/pkg/client/clientset/versioned/typed/kyverno/v1/fake/fake_policy.go
+++ b/pkg/client/clientset/versioned/typed/kyverno/v1/fake/fake_policy.go
@@ -19,7 +19,7 @@ limitations under the License.
 package fake
 
 import (
-	kyvernov1 "github.com/nirmata/kyverno/pkg/api/kyverno/v1"
+	kyvernov1 "github.com/kyverno/kyverno/pkg/api/kyverno/v1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	labels "k8s.io/apimachinery/pkg/labels"
 	schema "k8s.io/apimachinery/pkg/runtime/schema"
diff --git a/pkg/client/clientset/versioned/typed/kyverno/v1/fake/fake_policyviolation.go b/pkg/client/clientset/versioned/typed/kyverno/v1/fake/fake_policyviolation.go
index b713df63d..a815bc045 100644
--- a/pkg/client/clientset/versioned/typed/kyverno/v1/fake/fake_policyviolation.go
+++ b/pkg/client/clientset/versioned/typed/kyverno/v1/fake/fake_policyviolation.go
@@ -19,7 +19,7 @@ limitations under the License.
 package fake
 
 import (
-	kyvernov1 "github.com/nirmata/kyverno/pkg/api/kyverno/v1"
+	kyvernov1 "github.com/kyverno/kyverno/pkg/api/kyverno/v1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	labels "k8s.io/apimachinery/pkg/labels"
 	schema "k8s.io/apimachinery/pkg/runtime/schema"
diff --git a/pkg/client/clientset/versioned/typed/kyverno/v1/generaterequest.go b/pkg/client/clientset/versioned/typed/kyverno/v1/generaterequest.go
index 3b89a7ea3..dded57c9a 100644
--- a/pkg/client/clientset/versioned/typed/kyverno/v1/generaterequest.go
+++ b/pkg/client/clientset/versioned/typed/kyverno/v1/generaterequest.go
@@ -21,8 +21,8 @@ package v1
 import (
 	"time"
 
-	v1 "github.com/nirmata/kyverno/pkg/api/kyverno/v1"
-	scheme "github.com/nirmata/kyverno/pkg/client/clientset/versioned/scheme"
+	v1 "github.com/kyverno/kyverno/pkg/api/kyverno/v1"
+	scheme "github.com/kyverno/kyverno/pkg/client/clientset/versioned/scheme"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	types "k8s.io/apimachinery/pkg/types"
 	watch "k8s.io/apimachinery/pkg/watch"
diff --git a/pkg/client/clientset/versioned/typed/kyverno/v1/kyverno_client.go b/pkg/client/clientset/versioned/typed/kyverno/v1/kyverno_client.go
index 62d63d7ba..f2ae0d05e 100644
--- a/pkg/client/clientset/versioned/typed/kyverno/v1/kyverno_client.go
+++ b/pkg/client/clientset/versioned/typed/kyverno/v1/kyverno_client.go
@@ -19,8 +19,8 @@ limitations under the License.
 package v1
 
 import (
-	v1 "github.com/nirmata/kyverno/pkg/api/kyverno/v1"
-	"github.com/nirmata/kyverno/pkg/client/clientset/versioned/scheme"
+	v1 "github.com/kyverno/kyverno/pkg/api/kyverno/v1"
+	"github.com/kyverno/kyverno/pkg/client/clientset/versioned/scheme"
 	rest "k8s.io/client-go/rest"
 )
 
diff --git a/pkg/client/clientset/versioned/typed/kyverno/v1/policy.go b/pkg/client/clientset/versioned/typed/kyverno/v1/policy.go
index 6dc55b69f..2a68572f5 100644
--- a/pkg/client/clientset/versioned/typed/kyverno/v1/policy.go
+++ b/pkg/client/clientset/versioned/typed/kyverno/v1/policy.go
@@ -21,8 +21,8 @@ package v1
 import (
 	"time"
 
-	v1 "github.com/nirmata/kyverno/pkg/api/kyverno/v1"
-	scheme "github.com/nirmata/kyverno/pkg/client/clientset/versioned/scheme"
+	v1 "github.com/kyverno/kyverno/pkg/api/kyverno/v1"
+	scheme "github.com/kyverno/kyverno/pkg/client/clientset/versioned/scheme"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	types "k8s.io/apimachinery/pkg/types"
 	watch "k8s.io/apimachinery/pkg/watch"
diff --git a/pkg/client/clientset/versioned/typed/kyverno/v1/policyviolation.go b/pkg/client/clientset/versioned/typed/kyverno/v1/policyviolation.go
index eb08198f5..6fe7536ae 100644
--- a/pkg/client/clientset/versioned/typed/kyverno/v1/policyviolation.go
+++ b/pkg/client/clientset/versioned/typed/kyverno/v1/policyviolation.go
@@ -21,8 +21,8 @@ package v1
 import (
 	"time"
 
-	v1 "github.com/nirmata/kyverno/pkg/api/kyverno/v1"
-	scheme "github.com/nirmata/kyverno/pkg/client/clientset/versioned/scheme"
+	v1 "github.com/kyverno/kyverno/pkg/api/kyverno/v1"
+	scheme "github.com/kyverno/kyverno/pkg/client/clientset/versioned/scheme"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	types "k8s.io/apimachinery/pkg/types"
 	watch "k8s.io/apimachinery/pkg/watch"
diff --git a/pkg/client/informers/externalversions/factory.go b/pkg/client/informers/externalversions/factory.go
index e2da4e38e..da28b4b6a 100644
--- a/pkg/client/informers/externalversions/factory.go
+++ b/pkg/client/informers/externalversions/factory.go
@@ -23,9 +23,9 @@ import (
 	sync "sync"
 	time "time"
 
-	versioned "github.com/nirmata/kyverno/pkg/client/clientset/versioned"
-	internalinterfaces "github.com/nirmata/kyverno/pkg/client/informers/externalversions/internalinterfaces"
-	kyverno "github.com/nirmata/kyverno/pkg/client/informers/externalversions/kyverno"
+	versioned "github.com/kyverno/kyverno/pkg/client/clientset/versioned"
+	internalinterfaces "github.com/kyverno/kyverno/pkg/client/informers/externalversions/internalinterfaces"
+	kyverno "github.com/kyverno/kyverno/pkg/client/informers/externalversions/kyverno"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	schema "k8s.io/apimachinery/pkg/runtime/schema"
diff --git a/pkg/client/informers/externalversions/generic.go b/pkg/client/informers/externalversions/generic.go
index 5a5b303d0..3eaa55bf8 100644
--- a/pkg/client/informers/externalversions/generic.go
+++ b/pkg/client/informers/externalversions/generic.go
@@ -21,7 +21,7 @@ package externalversions
 import (
 	"fmt"
 
-	v1 "github.com/nirmata/kyverno/pkg/api/kyverno/v1"
+	v1 "github.com/kyverno/kyverno/pkg/api/kyverno/v1"
 	schema "k8s.io/apimachinery/pkg/runtime/schema"
 	cache "k8s.io/client-go/tools/cache"
 )
diff --git a/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go b/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go
index 65a1d1de8..c1877bbed 100644
--- a/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go
+++ b/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go
@@ -21,7 +21,7 @@ package internalinterfaces
 import (
 	time "time"
 
-	versioned "github.com/nirmata/kyverno/pkg/client/clientset/versioned"
+	versioned "github.com/kyverno/kyverno/pkg/client/clientset/versioned"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	cache "k8s.io/client-go/tools/cache"
diff --git a/pkg/client/informers/externalversions/kyverno/interface.go b/pkg/client/informers/externalversions/kyverno/interface.go
index a193b1ff5..ad3090ecb 100644
--- a/pkg/client/informers/externalversions/kyverno/interface.go
+++ b/pkg/client/informers/externalversions/kyverno/interface.go
@@ -19,8 +19,8 @@ limitations under the License.
 package kyverno
 
 import (
-	internalinterfaces "github.com/nirmata/kyverno/pkg/client/informers/externalversions/internalinterfaces"
-	v1 "github.com/nirmata/kyverno/pkg/client/informers/externalversions/kyverno/v1"
+	internalinterfaces "github.com/kyverno/kyverno/pkg/client/informers/externalversions/internalinterfaces"
+	v1 "github.com/kyverno/kyverno/pkg/client/informers/externalversions/kyverno/v1"
 )
 
 // Interface provides access to each of this group's versions.
diff --git a/pkg/client/informers/externalversions/kyverno/v1/clusterpolicy.go b/pkg/client/informers/externalversions/kyverno/v1/clusterpolicy.go
index 061cc3df6..3e9353bc0 100644
--- a/pkg/client/informers/externalversions/kyverno/v1/clusterpolicy.go
+++ b/pkg/client/informers/externalversions/kyverno/v1/clusterpolicy.go
@@ -21,10 +21,10 @@ package v1
 import (
 	time "time"
 
-	kyvernov1 "github.com/nirmata/kyverno/pkg/api/kyverno/v1"
-	versioned "github.com/nirmata/kyverno/pkg/client/clientset/versioned"
-	internalinterfaces "github.com/nirmata/kyverno/pkg/client/informers/externalversions/internalinterfaces"
-	v1 "github.com/nirmata/kyverno/pkg/client/listers/kyverno/v1"
+	kyvernov1 "github.com/kyverno/kyverno/pkg/api/kyverno/v1"
+	versioned "github.com/kyverno/kyverno/pkg/client/clientset/versioned"
+	internalinterfaces "github.com/kyverno/kyverno/pkg/client/informers/externalversions/internalinterfaces"
+	v1 "github.com/kyverno/kyverno/pkg/client/listers/kyverno/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
diff --git a/pkg/client/informers/externalversions/kyverno/v1/clusterpolicyviolation.go b/pkg/client/informers/externalversions/kyverno/v1/clusterpolicyviolation.go
index 174b6a520..26e67f4f7 100644
--- a/pkg/client/informers/externalversions/kyverno/v1/clusterpolicyviolation.go
+++ b/pkg/client/informers/externalversions/kyverno/v1/clusterpolicyviolation.go
@@ -21,10 +21,10 @@ package v1
 import (
 	time "time"
 
-	kyvernov1 "github.com/nirmata/kyverno/pkg/api/kyverno/v1"
-	versioned "github.com/nirmata/kyverno/pkg/client/clientset/versioned"
-	internalinterfaces "github.com/nirmata/kyverno/pkg/client/informers/externalversions/internalinterfaces"
-	v1 "github.com/nirmata/kyverno/pkg/client/listers/kyverno/v1"
+	kyvernov1 "github.com/kyverno/kyverno/pkg/api/kyverno/v1"
+	versioned "github.com/kyverno/kyverno/pkg/client/clientset/versioned"
+	internalinterfaces "github.com/kyverno/kyverno/pkg/client/informers/externalversions/internalinterfaces"
+	v1 "github.com/kyverno/kyverno/pkg/client/listers/kyverno/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
diff --git a/pkg/client/informers/externalversions/kyverno/v1/generaterequest.go b/pkg/client/informers/externalversions/kyverno/v1/generaterequest.go
index f03a98364..ac079fa0d 100644
--- a/pkg/client/informers/externalversions/kyverno/v1/generaterequest.go
+++ b/pkg/client/informers/externalversions/kyverno/v1/generaterequest.go
@@ -21,10 +21,10 @@ package v1
 import (
 	time "time"
 
-	kyvernov1 "github.com/nirmata/kyverno/pkg/api/kyverno/v1"
-	versioned "github.com/nirmata/kyverno/pkg/client/clientset/versioned"
-	internalinterfaces "github.com/nirmata/kyverno/pkg/client/informers/externalversions/internalinterfaces"
-	v1 "github.com/nirmata/kyverno/pkg/client/listers/kyverno/v1"
+	kyvernov1 "github.com/kyverno/kyverno/pkg/api/kyverno/v1"
+	versioned "github.com/kyverno/kyverno/pkg/client/clientset/versioned"
+	internalinterfaces "github.com/kyverno/kyverno/pkg/client/informers/externalversions/internalinterfaces"
+	v1 "github.com/kyverno/kyverno/pkg/client/listers/kyverno/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
diff --git a/pkg/client/informers/externalversions/kyverno/v1/interface.go b/pkg/client/informers/externalversions/kyverno/v1/interface.go
index da449426a..6ac96024c 100644
--- a/pkg/client/informers/externalversions/kyverno/v1/interface.go
+++ b/pkg/client/informers/externalversions/kyverno/v1/interface.go
@@ -19,7 +19,7 @@ limitations under the License.
 package v1
 
 import (
-	internalinterfaces "github.com/nirmata/kyverno/pkg/client/informers/externalversions/internalinterfaces"
+	internalinterfaces "github.com/kyverno/kyverno/pkg/client/informers/externalversions/internalinterfaces"
 )
 
 // Interface provides access to all the informers in this group version.
diff --git a/pkg/client/informers/externalversions/kyverno/v1/policy.go b/pkg/client/informers/externalversions/kyverno/v1/policy.go
index 50aea4c1b..eff6368b1 100644
--- a/pkg/client/informers/externalversions/kyverno/v1/policy.go
+++ b/pkg/client/informers/externalversions/kyverno/v1/policy.go
@@ -21,10 +21,10 @@ package v1
 import (
 	time "time"
 
-	kyvernov1 "github.com/nirmata/kyverno/pkg/api/kyverno/v1"
-	versioned "github.com/nirmata/kyverno/pkg/client/clientset/versioned"
-	internalinterfaces "github.com/nirmata/kyverno/pkg/client/informers/externalversions/internalinterfaces"
-	v1 "github.com/nirmata/kyverno/pkg/client/listers/kyverno/v1"
+	kyvernov1 "github.com/kyverno/kyverno/pkg/api/kyverno/v1"
+	versioned "github.com/kyverno/kyverno/pkg/client/clientset/versioned"
+	internalinterfaces "github.com/kyverno/kyverno/pkg/client/informers/externalversions/internalinterfaces"
+	v1 "github.com/kyverno/kyverno/pkg/client/listers/kyverno/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
diff --git a/pkg/client/informers/externalversions/kyverno/v1/policyviolation.go b/pkg/client/informers/externalversions/kyverno/v1/policyviolation.go
index 224aec966..1d2778524 100644
--- a/pkg/client/informers/externalversions/kyverno/v1/policyviolation.go
+++ b/pkg/client/informers/externalversions/kyverno/v1/policyviolation.go
@@ -21,10 +21,10 @@ package v1
 import (
 	time "time"
 
-	kyvernov1 "github.com/nirmata/kyverno/pkg/api/kyverno/v1"
-	versioned "github.com/nirmata/kyverno/pkg/client/clientset/versioned"
-	internalinterfaces "github.com/nirmata/kyverno/pkg/client/informers/externalversions/internalinterfaces"
-	v1 "github.com/nirmata/kyverno/pkg/client/listers/kyverno/v1"
+	kyvernov1 "github.com/kyverno/kyverno/pkg/api/kyverno/v1"
+	versioned "github.com/kyverno/kyverno/pkg/client/clientset/versioned"
+	internalinterfaces "github.com/kyverno/kyverno/pkg/client/informers/externalversions/internalinterfaces"
+	v1 "github.com/kyverno/kyverno/pkg/client/listers/kyverno/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
diff --git a/pkg/client/listers/kyverno/v1/clusterpolicy.go b/pkg/client/listers/kyverno/v1/clusterpolicy.go
index 4455994d3..3fee33274 100644
--- a/pkg/client/listers/kyverno/v1/clusterpolicy.go
+++ b/pkg/client/listers/kyverno/v1/clusterpolicy.go
@@ -19,7 +19,7 @@ limitations under the License.
 package v1
 
 import (
-	v1 "github.com/nirmata/kyverno/pkg/api/kyverno/v1"
+	v1 "github.com/kyverno/kyverno/pkg/api/kyverno/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/client-go/tools/cache"
diff --git a/pkg/client/listers/kyverno/v1/clusterpolicyviolation.go b/pkg/client/listers/kyverno/v1/clusterpolicyviolation.go
index 64691fcd8..9b1595da4 100644
--- a/pkg/client/listers/kyverno/v1/clusterpolicyviolation.go
+++ b/pkg/client/listers/kyverno/v1/clusterpolicyviolation.go
@@ -19,7 +19,7 @@ limitations under the License.
 package v1
 
 import (
-	v1 "github.com/nirmata/kyverno/pkg/api/kyverno/v1"
+	v1 "github.com/kyverno/kyverno/pkg/api/kyverno/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/client-go/tools/cache"
diff --git a/pkg/client/listers/kyverno/v1/expansion_generated.go b/pkg/client/listers/kyverno/v1/expansion_generated.go
index 86eb7aeff..07befe1b0 100644
--- a/pkg/client/listers/kyverno/v1/expansion_generated.go
+++ b/pkg/client/listers/kyverno/v1/expansion_generated.go
@@ -21,7 +21,7 @@ package v1
 import (
 	"fmt"
 
-	kyvernov1 "github.com/nirmata/kyverno/pkg/api/kyverno/v1"
+	kyvernov1 "github.com/kyverno/kyverno/pkg/api/kyverno/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
 )
diff --git a/pkg/client/listers/kyverno/v1/generaterequest.go b/pkg/client/listers/kyverno/v1/generaterequest.go
index 5329aab8e..c999f91b1 100644
--- a/pkg/client/listers/kyverno/v1/generaterequest.go
+++ b/pkg/client/listers/kyverno/v1/generaterequest.go
@@ -19,7 +19,7 @@ limitations under the License.
 package v1
 
 import (
-	v1 "github.com/nirmata/kyverno/pkg/api/kyverno/v1"
+	v1 "github.com/kyverno/kyverno/pkg/api/kyverno/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/client-go/tools/cache"
diff --git a/pkg/client/listers/kyverno/v1/policy.go b/pkg/client/listers/kyverno/v1/policy.go
index cb10b84ab..f01389a2b 100644
--- a/pkg/client/listers/kyverno/v1/policy.go
+++ b/pkg/client/listers/kyverno/v1/policy.go
@@ -19,7 +19,7 @@ limitations under the License.
 package v1
 
 import (
-	v1 "github.com/nirmata/kyverno/pkg/api/kyverno/v1"
+	v1 "github.com/kyverno/kyverno/pkg/api/kyverno/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/client-go/tools/cache"
diff --git a/pkg/client/listers/kyverno/v1/policyviolation.go b/pkg/client/listers/kyverno/v1/policyviolation.go
index d141ba8e5..359eeae92 100644
--- a/pkg/client/listers/kyverno/v1/policyviolation.go
+++ b/pkg/client/listers/kyverno/v1/policyviolation.go
@@ -19,7 +19,7 @@ limitations under the License.
 package v1
 
 import (
-	v1 "github.com/nirmata/kyverno/pkg/api/kyverno/v1"
+	v1 "github.com/kyverno/kyverno/pkg/api/kyverno/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/client-go/tools/cache"
diff --git a/pkg/dclient/certificates.go b/pkg/dclient/certificates.go
index eeba6eb26..1047e8a7c 100644
--- a/pkg/dclient/certificates.go
+++ b/pkg/dclient/certificates.go
@@ -6,8 +6,8 @@ import (
 	"net/url"
 	"time"
 
-	"github.com/nirmata/kyverno/pkg/config"
-	tls "github.com/nirmata/kyverno/pkg/tls"
+	"github.com/kyverno/kyverno/pkg/config"
+	tls "github.com/kyverno/kyverno/pkg/tls"
 	certificates "k8s.io/api/certificates/v1beta1"
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -59,7 +59,7 @@ func (c *Client) generateTLSPemPair(props tls.TlsCertificateProps, fqdncn bool)
 
 	tlsCert, err := c.fetchCertificateFromRequest(certRequest, 10)
 	if err != nil {
-		return nil, fmt.Errorf("Failed to configure a certificate for the Kyverno controller. A CA certificate is required to allow the Kubernetes API Server to communicate with Kyverno. You can either provide a certificate or configure your cluster to allow certificate signing. Please refer to https://github.com/nirmata/kyverno/installation.md.: %v", err)
+		return nil, fmt.Errorf("Failed to configure a certificate for the Kyverno controller. A CA certificate is required to allow the Kubernetes API Server to communicate with Kyverno. You can either provide a certificate or configure your cluster to allow certificate signing. Please refer to https://github.com/kyverno/kyverno/installation.md.: %v", err)
 	}
 
 	return &tls.TlsPemPair{
diff --git a/pkg/dclient/client.go b/pkg/dclient/client.go
index 0a82641d6..88a88cf87 100644
--- a/pkg/dclient/client.go
+++ b/pkg/dclient/client.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/go-logr/logr"
 	openapi_v2 "github.com/googleapis/gnostic/OpenAPIv2"
-	"github.com/nirmata/kyverno/pkg/config"
+	"github.com/kyverno/kyverno/pkg/config"
 	apps "k8s.io/api/apps/v1"
 	certificates "k8s.io/api/certificates/v1beta1"
 	v1 "k8s.io/api/core/v1"
diff --git a/pkg/engine/anchor/anchor.go b/pkg/engine/anchor/anchor.go
index c5d3f3b10..feb306904 100644
--- a/pkg/engine/anchor/anchor.go
+++ b/pkg/engine/anchor/anchor.go
@@ -5,8 +5,8 @@ import (
 	"strconv"
 
 	"github.com/go-logr/logr"
-	commonAnchors "github.com/nirmata/kyverno/pkg/engine/anchor/common"
-	"github.com/nirmata/kyverno/pkg/engine/common"
+	commonAnchors "github.com/kyverno/kyverno/pkg/engine/anchor/common"
+	"github.com/kyverno/kyverno/pkg/engine/common"
 	"sigs.k8s.io/controller-runtime/pkg/log"
 )
 
diff --git a/pkg/engine/common/anchorKey.go b/pkg/engine/common/anchorKey.go
index 8d0efb4e6..a2771140e 100644
--- a/pkg/engine/common/anchorKey.go
+++ b/pkg/engine/common/anchorKey.go
@@ -1,7 +1,7 @@
 package common
 
 import (
-	"github.com/nirmata/kyverno/pkg/engine/anchor/common"
+	"github.com/kyverno/kyverno/pkg/engine/anchor/common"
 )
 
 // AnchorKey - contains map of anchors
diff --git a/pkg/engine/context/context.go b/pkg/engine/context/context.go
index 732b4eeb4..b2e02dd90 100644
--- a/pkg/engine/context/context.go
+++ b/pkg/engine/context/context.go
@@ -9,7 +9,7 @@ import (
 
 	jsonpatch "github.com/evanphx/json-patch"
 	"github.com/go-logr/logr"
-	kyverno "github.com/nirmata/kyverno/pkg/api/kyverno/v1"
+	kyverno "github.com/kyverno/kyverno/pkg/api/kyverno/v1"
 	"sigs.k8s.io/controller-runtime/pkg/log"
 )
 
diff --git a/pkg/engine/forceMutate.go b/pkg/engine/forceMutate.go
index 9ca89619f..100245193 100644
--- a/pkg/engine/forceMutate.go
+++ b/pkg/engine/forceMutate.go
@@ -5,12 +5,12 @@ import (
 	"fmt"
 	"regexp"
 
-	kyverno "github.com/nirmata/kyverno/pkg/api/kyverno/v1"
-	"github.com/nirmata/kyverno/pkg/engine/context"
-	"github.com/nirmata/kyverno/pkg/engine/mutate"
-	"github.com/nirmata/kyverno/pkg/engine/response"
-	"github.com/nirmata/kyverno/pkg/engine/utils"
-	"github.com/nirmata/kyverno/pkg/engine/variables"
+	kyverno "github.com/kyverno/kyverno/pkg/api/kyverno/v1"
+	"github.com/kyverno/kyverno/pkg/engine/context"
+	"github.com/kyverno/kyverno/pkg/engine/mutate"
+	"github.com/kyverno/kyverno/pkg/engine/response"
+	"github.com/kyverno/kyverno/pkg/engine/utils"
+	"github.com/kyverno/kyverno/pkg/engine/variables"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"sigs.k8s.io/controller-runtime/pkg/log"
 )
diff --git a/pkg/engine/generation.go b/pkg/engine/generation.go
index b7088503e..37819e463 100644
--- a/pkg/engine/generation.go
+++ b/pkg/engine/generation.go
@@ -5,11 +5,11 @@ import (
 
 	"github.com/go-logr/logr"
 
-	kyverno "github.com/nirmata/kyverno/pkg/api/kyverno/v1"
-	"github.com/nirmata/kyverno/pkg/engine/context"
-	"github.com/nirmata/kyverno/pkg/engine/response"
-	"github.com/nirmata/kyverno/pkg/engine/variables"
-	"github.com/nirmata/kyverno/pkg/resourcecache"
+	kyverno "github.com/kyverno/kyverno/pkg/api/kyverno/v1"
+	"github.com/kyverno/kyverno/pkg/engine/context"
+	"github.com/kyverno/kyverno/pkg/engine/response"
+	"github.com/kyverno/kyverno/pkg/engine/variables"
+	"github.com/kyverno/kyverno/pkg/resourcecache"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"sigs.k8s.io/controller-runtime/pkg/log"
 )
diff --git a/pkg/engine/mutate/mutation.go b/pkg/engine/mutate/mutation.go
index 6ae3a4675..092b9c371 100644
--- a/pkg/engine/mutate/mutation.go
+++ b/pkg/engine/mutate/mutation.go
@@ -2,11 +2,11 @@ package mutate
 
 import (
 	"github.com/go-logr/logr"
-	kyverno "github.com/nirmata/kyverno/pkg/api/kyverno/v1"
-	"github.com/nirmata/kyverno/pkg/engine/context"
-	"github.com/nirmata/kyverno/pkg/engine/response"
-	"github.com/nirmata/kyverno/pkg/engine/utils"
-	"github.com/nirmata/kyverno/pkg/engine/variables"
+	kyverno "github.com/kyverno/kyverno/pkg/api/kyverno/v1"
+	"github.com/kyverno/kyverno/pkg/engine/context"
+	"github.com/kyverno/kyverno/pkg/engine/response"
+	"github.com/kyverno/kyverno/pkg/engine/utils"
+	"github.com/kyverno/kyverno/pkg/engine/variables"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 )
 
diff --git a/pkg/engine/mutate/overlay.go b/pkg/engine/mutate/overlay.go
index d1b4c37ad..e37c562cb 100644
--- a/pkg/engine/mutate/overlay.go
+++ b/pkg/engine/mutate/overlay.go
@@ -15,9 +15,9 @@ import (
 
 	jsonpatch "github.com/evanphx/json-patch"
 	"github.com/go-logr/logr"
-	commonAnchors "github.com/nirmata/kyverno/pkg/engine/anchor/common"
-	"github.com/nirmata/kyverno/pkg/engine/response"
-	"github.com/nirmata/kyverno/pkg/engine/utils"
+	commonAnchors "github.com/kyverno/kyverno/pkg/engine/anchor/common"
+	"github.com/kyverno/kyverno/pkg/engine/response"
+	"github.com/kyverno/kyverno/pkg/engine/utils"
 )
 
 // ProcessOverlay processes mutation overlay on the resource
diff --git a/pkg/engine/mutate/overlayCondition.go b/pkg/engine/mutate/overlayCondition.go
index def32b81f..e0e1574fe 100755
--- a/pkg/engine/mutate/overlayCondition.go
+++ b/pkg/engine/mutate/overlayCondition.go
@@ -6,8 +6,8 @@ import (
 	"strconv"
 
 	"github.com/go-logr/logr"
-	commonAnchors "github.com/nirmata/kyverno/pkg/engine/anchor/common"
-	"github.com/nirmata/kyverno/pkg/engine/validate"
+	commonAnchors "github.com/kyverno/kyverno/pkg/engine/anchor/common"
+	"github.com/kyverno/kyverno/pkg/engine/validate"
 	"sigs.k8s.io/controller-runtime/pkg/log"
 )
 
diff --git a/pkg/engine/mutate/patchJson6902.go b/pkg/engine/mutate/patchJson6902.go
index d78aa49b3..92b6217f2 100644
--- a/pkg/engine/mutate/patchJson6902.go
+++ b/pkg/engine/mutate/patchJson6902.go
@@ -9,9 +9,9 @@ import (
 
 	jsonpatch "github.com/evanphx/json-patch"
 	"github.com/go-logr/logr"
-	kyverno "github.com/nirmata/kyverno/pkg/api/kyverno/v1"
-	"github.com/nirmata/kyverno/pkg/engine/response"
-	"github.com/nirmata/kyverno/pkg/engine/utils"
+	kyverno "github.com/kyverno/kyverno/pkg/api/kyverno/v1"
+	"github.com/kyverno/kyverno/pkg/engine/response"
+	"github.com/kyverno/kyverno/pkg/engine/utils"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	patchjson6902 "sigs.k8s.io/kustomize/api/filters/patchjson6902"
 	filtersutil "sigs.k8s.io/kustomize/kyaml/filtersutil"
diff --git a/pkg/engine/mutate/patches.go b/pkg/engine/mutate/patches.go
index 5ac81f083..57cfb7b72 100644
--- a/pkg/engine/mutate/patches.go
+++ b/pkg/engine/mutate/patches.go
@@ -7,9 +7,9 @@ import (
 	"time"
 
 	"github.com/go-logr/logr"
-	kyverno "github.com/nirmata/kyverno/pkg/api/kyverno/v1"
-	"github.com/nirmata/kyverno/pkg/engine/response"
-	"github.com/nirmata/kyverno/pkg/engine/utils"
+	kyverno "github.com/kyverno/kyverno/pkg/api/kyverno/v1"
+	"github.com/kyverno/kyverno/pkg/engine/response"
+	"github.com/kyverno/kyverno/pkg/engine/utils"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 )
 
diff --git a/pkg/engine/mutate/patchesUtils.go b/pkg/engine/mutate/patchesUtils.go
index f90c87357..d18800003 100644
--- a/pkg/engine/mutate/patchesUtils.go
+++ b/pkg/engine/mutate/patchesUtils.go
@@ -11,7 +11,7 @@ import (
 
 	evanjsonpatch "github.com/evanphx/json-patch"
 	"github.com/go-logr/logr"
-	kyverno "github.com/nirmata/kyverno/pkg/api/kyverno/v1"
+	kyverno "github.com/kyverno/kyverno/pkg/api/kyverno/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 )
 
diff --git a/pkg/engine/mutate/strategicMergePatch.go b/pkg/engine/mutate/strategicMergePatch.go
index cadcd2e26..19576011c 100644
--- a/pkg/engine/mutate/strategicMergePatch.go
+++ b/pkg/engine/mutate/strategicMergePatch.go
@@ -9,8 +9,8 @@ import (
 	"time"
 
 	"github.com/go-logr/logr"
-	"github.com/nirmata/kyverno/pkg/engine/response"
-	"github.com/nirmata/kyverno/pkg/engine/utils"
+	"github.com/kyverno/kyverno/pkg/engine/response"
+	"github.com/kyverno/kyverno/pkg/engine/utils"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"sigs.k8s.io/kustomize/api/filters/patchstrategicmerge"
 	filtersutil "sigs.k8s.io/kustomize/kyaml/filtersutil"
diff --git a/pkg/engine/mutate/strategicPreprocessing.go b/pkg/engine/mutate/strategicPreprocessing.go
index 69e02cc5c..1d582e6fa 100644
--- a/pkg/engine/mutate/strategicPreprocessing.go
+++ b/pkg/engine/mutate/strategicPreprocessing.go
@@ -1,8 +1,8 @@
 package mutate
 
 import (
+	anchor "github.com/kyverno/kyverno/pkg/engine/anchor/common"
 	"github.com/minio/minio/pkg/wildcard"
-	anchor "github.com/nirmata/kyverno/pkg/engine/anchor/common"
 	yaml "sigs.k8s.io/kustomize/kyaml/yaml"
 )
 
diff --git a/pkg/engine/mutate/utils.go b/pkg/engine/mutate/utils.go
index 300d1699d..2de613db0 100644
--- a/pkg/engine/mutate/utils.go
+++ b/pkg/engine/mutate/utils.go
@@ -3,7 +3,7 @@ package mutate
 import (
 	"bytes"
 
-	commonAnchors "github.com/nirmata/kyverno/pkg/engine/anchor/common"
+	commonAnchors "github.com/kyverno/kyverno/pkg/engine/anchor/common"
 )
 
 type buffer struct {
diff --git a/pkg/engine/mutation.go b/pkg/engine/mutation.go
index d4decb932..2fa358e33 100644
--- a/pkg/engine/mutation.go
+++ b/pkg/engine/mutation.go
@@ -4,10 +4,10 @@ import (
 	"time"
 
 	"github.com/go-logr/logr"
-	kyverno "github.com/nirmata/kyverno/pkg/api/kyverno/v1"
-	"github.com/nirmata/kyverno/pkg/engine/mutate"
-	"github.com/nirmata/kyverno/pkg/engine/response"
-	"github.com/nirmata/kyverno/pkg/engine/variables"
+	kyverno "github.com/kyverno/kyverno/pkg/api/kyverno/v1"
+	"github.com/kyverno/kyverno/pkg/engine/mutate"
+	"github.com/kyverno/kyverno/pkg/engine/response"
+	"github.com/kyverno/kyverno/pkg/engine/variables"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"sigs.k8s.io/controller-runtime/pkg/log"
 )
diff --git a/pkg/engine/policyContext.go b/pkg/engine/policyContext.go
index c2c9d0a4f..764f31883 100644
--- a/pkg/engine/policyContext.go
+++ b/pkg/engine/policyContext.go
@@ -1,10 +1,10 @@
 package engine
 
 import (
-	kyverno "github.com/nirmata/kyverno/pkg/api/kyverno/v1"
-	client "github.com/nirmata/kyverno/pkg/dclient"
-	"github.com/nirmata/kyverno/pkg/engine/context"
-	"github.com/nirmata/kyverno/pkg/resourcecache"
+	kyverno "github.com/kyverno/kyverno/pkg/api/kyverno/v1"
+	client "github.com/kyverno/kyverno/pkg/dclient"
+	"github.com/kyverno/kyverno/pkg/engine/context"
+	"github.com/kyverno/kyverno/pkg/resourcecache"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 )
 
diff --git a/pkg/engine/utils.go b/pkg/engine/utils.go
index ac5a8bbda..6b471f6bb 100644
--- a/pkg/engine/utils.go
+++ b/pkg/engine/utils.go
@@ -9,19 +9,19 @@ import (
 	"time"
 
 	"github.com/go-logr/logr"
-	"github.com/nirmata/kyverno/pkg/utils"
+	"github.com/kyverno/kyverno/pkg/utils"
 	authenticationv1 "k8s.io/api/authentication/v1"
 	rbacv1 "k8s.io/api/rbac/v1"
 	"sigs.k8s.io/controller-runtime/pkg/log"
 
+	kyverno "github.com/kyverno/kyverno/pkg/api/kyverno/v1"
 	"github.com/minio/minio/pkg/wildcard"
-	kyverno "github.com/nirmata/kyverno/pkg/api/kyverno/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/labels"
 
-	"github.com/nirmata/kyverno/pkg/engine/context"
-	"github.com/nirmata/kyverno/pkg/resourcecache"
+	"github.com/kyverno/kyverno/pkg/engine/context"
+	"github.com/kyverno/kyverno/pkg/resourcecache"
 	"k8s.io/apimachinery/pkg/runtime"
 )
 
@@ -176,7 +176,7 @@ func matchSubjects(ruleSubjects []rbacv1.Subject, userInfo authenticationv1.User
 
 	userGroups := append(userInfo.Groups, userInfo.Username)
 
-	// TODO: see issue https://github.com/nirmata/kyverno/issues/861
+	// TODO: see issue https://github.com/kyverno/kyverno/issues/861
 	for _, e := range dynamicConfig {
 		ruleSubjects = append(ruleSubjects,
 			rbacv1.Subject{Kind: "Group", Name: e},
diff --git a/pkg/engine/utils/utils.go b/pkg/engine/utils/utils.go
index 9ca7492ae..02bf3029d 100644
--- a/pkg/engine/utils/utils.go
+++ b/pkg/engine/utils/utils.go
@@ -4,8 +4,8 @@ import (
 	"encoding/json"
 
 	jsonpatch "github.com/evanphx/json-patch"
-	kyverno "github.com/nirmata/kyverno/pkg/api/kyverno/v1"
-	commonAnchor "github.com/nirmata/kyverno/pkg/engine/anchor/common"
+	kyverno "github.com/kyverno/kyverno/pkg/api/kyverno/v1"
+	commonAnchor "github.com/kyverno/kyverno/pkg/engine/anchor/common"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"sigs.k8s.io/controller-runtime/pkg/log"
 )
diff --git a/pkg/engine/validate/pattern.go b/pkg/engine/validate/pattern.go
index 83d6adc4b..7e2edf23a 100644
--- a/pkg/engine/validate/pattern.go
+++ b/pkg/engine/validate/pattern.go
@@ -8,8 +8,8 @@ import (
 	"strings"
 
 	"github.com/go-logr/logr"
+	"github.com/kyverno/kyverno/pkg/engine/operator"
 	"github.com/minio/minio/pkg/wildcard"
-	"github.com/nirmata/kyverno/pkg/engine/operator"
 	apiresource "k8s.io/apimachinery/pkg/api/resource"
 )
 
diff --git a/pkg/engine/validate/utils.go b/pkg/engine/validate/utils.go
index 0ad96f1dc..f2c3fa77f 100644
--- a/pkg/engine/validate/utils.go
+++ b/pkg/engine/validate/utils.go
@@ -2,7 +2,8 @@ package validate
 
 import (
 	"container/list"
-	commonAnchors "github.com/nirmata/kyverno/pkg/engine/anchor/common"
+
+	commonAnchors "github.com/kyverno/kyverno/pkg/engine/anchor/common"
 )
 
 // Checks if pattern has anchors
diff --git a/pkg/engine/validate/validate.go b/pkg/engine/validate/validate.go
index efbdee70e..6d12524db 100644
--- a/pkg/engine/validate/validate.go
+++ b/pkg/engine/validate/validate.go
@@ -9,10 +9,10 @@ import (
 	"strings"
 
 	"github.com/go-logr/logr"
-	"github.com/nirmata/kyverno/pkg/engine/anchor"
-	commonAnchors "github.com/nirmata/kyverno/pkg/engine/anchor/common"
-	"github.com/nirmata/kyverno/pkg/engine/common"
-	"github.com/nirmata/kyverno/pkg/engine/operator"
+	"github.com/kyverno/kyverno/pkg/engine/anchor"
+	commonAnchors "github.com/kyverno/kyverno/pkg/engine/anchor/common"
+	"github.com/kyverno/kyverno/pkg/engine/common"
+	"github.com/kyverno/kyverno/pkg/engine/operator"
 )
 
 // ValidateResourceWithPattern is a start of element-by-element validation process
diff --git a/pkg/engine/validation.go b/pkg/engine/validation.go
index 11f06640d..58a018ffe 100644
--- a/pkg/engine/validation.go
+++ b/pkg/engine/validation.go
@@ -6,13 +6,13 @@ import (
 	"time"
 
 	"github.com/go-logr/logr"
-	kyverno "github.com/nirmata/kyverno/pkg/api/kyverno/v1"
-	"github.com/nirmata/kyverno/pkg/engine/context"
-	"github.com/nirmata/kyverno/pkg/engine/response"
-	"github.com/nirmata/kyverno/pkg/engine/utils"
-	"github.com/nirmata/kyverno/pkg/engine/validate"
-	"github.com/nirmata/kyverno/pkg/engine/variables"
-	"github.com/nirmata/kyverno/pkg/resourcecache"
+	kyverno "github.com/kyverno/kyverno/pkg/api/kyverno/v1"
+	"github.com/kyverno/kyverno/pkg/engine/context"
+	"github.com/kyverno/kyverno/pkg/engine/response"
+	"github.com/kyverno/kyverno/pkg/engine/utils"
+	"github.com/kyverno/kyverno/pkg/engine/validate"
+	"github.com/kyverno/kyverno/pkg/engine/variables"
+	"github.com/kyverno/kyverno/pkg/resourcecache"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"sigs.k8s.io/controller-runtime/pkg/log"
 )
diff --git a/pkg/engine/variables/evaluate.go b/pkg/engine/variables/evaluate.go
index d0ebf7ed7..34ab58a31 100644
--- a/pkg/engine/variables/evaluate.go
+++ b/pkg/engine/variables/evaluate.go
@@ -2,9 +2,9 @@ package variables
 
 import (
 	"github.com/go-logr/logr"
-	kyverno "github.com/nirmata/kyverno/pkg/api/kyverno/v1"
-	"github.com/nirmata/kyverno/pkg/engine/context"
-	"github.com/nirmata/kyverno/pkg/engine/variables/operator"
+	kyverno "github.com/kyverno/kyverno/pkg/api/kyverno/v1"
+	"github.com/kyverno/kyverno/pkg/engine/context"
+	"github.com/kyverno/kyverno/pkg/engine/variables/operator"
 )
 
 //Evaluate evaluates the condition
diff --git a/pkg/engine/variables/operator/equal.go b/pkg/engine/variables/operator/equal.go
index 1bc181f0f..a0a1f666d 100644
--- a/pkg/engine/variables/operator/equal.go
+++ b/pkg/engine/variables/operator/equal.go
@@ -7,7 +7,7 @@ import (
 	"strconv"
 
 	"github.com/go-logr/logr"
-	"github.com/nirmata/kyverno/pkg/engine/context"
+	"github.com/kyverno/kyverno/pkg/engine/context"
 )
 
 //NewEqualHandler returns handler to manage Equal operations
diff --git a/pkg/engine/variables/operator/in.go b/pkg/engine/variables/operator/in.go
index 29915d627..af74d9c11 100644
--- a/pkg/engine/variables/operator/in.go
+++ b/pkg/engine/variables/operator/in.go
@@ -6,7 +6,7 @@ import (
 	"reflect"
 
 	"github.com/go-logr/logr"
-	"github.com/nirmata/kyverno/pkg/engine/context"
+	"github.com/kyverno/kyverno/pkg/engine/context"
 )
 
 //NewInHandler returns handler to manage In operations
diff --git a/pkg/engine/variables/operator/notequal.go b/pkg/engine/variables/operator/notequal.go
index ce9b4e87f..521eec38a 100644
--- a/pkg/engine/variables/operator/notequal.go
+++ b/pkg/engine/variables/operator/notequal.go
@@ -7,7 +7,7 @@ import (
 	"strconv"
 
 	"github.com/go-logr/logr"
-	"github.com/nirmata/kyverno/pkg/engine/context"
+	"github.com/kyverno/kyverno/pkg/engine/context"
 )
 
 //NewNotEqualHandler returns handler to manage NotEqual operations
diff --git a/pkg/engine/variables/operator/notin.go b/pkg/engine/variables/operator/notin.go
index 697002d3c..b45c9fbd2 100644
--- a/pkg/engine/variables/operator/notin.go
+++ b/pkg/engine/variables/operator/notin.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 
 	"github.com/go-logr/logr"
-	"github.com/nirmata/kyverno/pkg/engine/context"
+	"github.com/kyverno/kyverno/pkg/engine/context"
 )
 
 //NewNotInHandler returns handler to manage NotIn operations
diff --git a/pkg/engine/variables/operator/operator.go b/pkg/engine/variables/operator/operator.go
index ef2976c4d..b6c853a68 100644
--- a/pkg/engine/variables/operator/operator.go
+++ b/pkg/engine/variables/operator/operator.go
@@ -2,8 +2,8 @@ package operator
 
 import (
 	"github.com/go-logr/logr"
-	kyverno "github.com/nirmata/kyverno/pkg/api/kyverno/v1"
-	"github.com/nirmata/kyverno/pkg/engine/context"
+	kyverno "github.com/kyverno/kyverno/pkg/api/kyverno/v1"
+	"github.com/kyverno/kyverno/pkg/engine/context"
 )
 
 //OperatorHandler provides interface to manage types
diff --git a/pkg/engine/variables/vars.go b/pkg/engine/variables/vars.go
index b57bfbfd7..261cb510d 100644
--- a/pkg/engine/variables/vars.go
+++ b/pkg/engine/variables/vars.go
@@ -7,7 +7,7 @@ import (
 	"strings"
 
 	"github.com/go-logr/logr"
-	"github.com/nirmata/kyverno/pkg/engine/context"
+	"github.com/kyverno/kyverno/pkg/engine/context"
 )
 
 const (
diff --git a/pkg/event/controller.go b/pkg/event/controller.go
index b032c14af..e3c0957be 100644
--- a/pkg/event/controller.go
+++ b/pkg/event/controller.go
@@ -3,11 +3,11 @@ package event
 import (
 	"github.com/go-logr/logr"
 
-	"github.com/nirmata/kyverno/pkg/client/clientset/versioned/scheme"
-	kyvernoinformer "github.com/nirmata/kyverno/pkg/client/informers/externalversions/kyverno/v1"
-	kyvernolister "github.com/nirmata/kyverno/pkg/client/listers/kyverno/v1"
-	"github.com/nirmata/kyverno/pkg/constant"
-	client "github.com/nirmata/kyverno/pkg/dclient"
+	"github.com/kyverno/kyverno/pkg/client/clientset/versioned/scheme"
+	kyvernoinformer "github.com/kyverno/kyverno/pkg/client/informers/externalversions/kyverno/v1"
+	kyvernolister "github.com/kyverno/kyverno/pkg/client/listers/kyverno/v1"
+	"github.com/kyverno/kyverno/pkg/constant"
+	client "github.com/kyverno/kyverno/pkg/dclient"
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
diff --git a/pkg/generate/cleanup/cleanup.go b/pkg/generate/cleanup/cleanup.go
index 735b52427..ebb645f9a 100644
--- a/pkg/generate/cleanup/cleanup.go
+++ b/pkg/generate/cleanup/cleanup.go
@@ -2,8 +2,8 @@ package cleanup
 
 import (
 	"github.com/go-logr/logr"
-	kyverno "github.com/nirmata/kyverno/pkg/api/kyverno/v1"
-	dclient "github.com/nirmata/kyverno/pkg/dclient"
+	kyverno "github.com/kyverno/kyverno/pkg/api/kyverno/v1"
+	dclient "github.com/kyverno/kyverno/pkg/dclient"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 )
 
diff --git a/pkg/generate/cleanup/controller.go b/pkg/generate/cleanup/controller.go
index 9e4f0e203..33775af23 100644
--- a/pkg/generate/cleanup/controller.go
+++ b/pkg/generate/cleanup/controller.go
@@ -4,13 +4,13 @@ import (
 	"time"
 
 	"github.com/go-logr/logr"
-	kyverno "github.com/nirmata/kyverno/pkg/api/kyverno/v1"
-	kyvernoclient "github.com/nirmata/kyverno/pkg/client/clientset/versioned"
-	kyvernoinformer "github.com/nirmata/kyverno/pkg/client/informers/externalversions/kyverno/v1"
-	kyvernolister "github.com/nirmata/kyverno/pkg/client/listers/kyverno/v1"
-	"github.com/nirmata/kyverno/pkg/config"
-	"github.com/nirmata/kyverno/pkg/constant"
-	dclient "github.com/nirmata/kyverno/pkg/dclient"
+	kyverno "github.com/kyverno/kyverno/pkg/api/kyverno/v1"
+	kyvernoclient "github.com/kyverno/kyverno/pkg/client/clientset/versioned"
+	kyvernoinformer "github.com/kyverno/kyverno/pkg/client/informers/externalversions/kyverno/v1"
+	kyvernolister "github.com/kyverno/kyverno/pkg/client/listers/kyverno/v1"
+	"github.com/kyverno/kyverno/pkg/config"
+	"github.com/kyverno/kyverno/pkg/constant"
+	dclient "github.com/kyverno/kyverno/pkg/dclient"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
diff --git a/pkg/generate/cleanup/resource.go b/pkg/generate/cleanup/resource.go
index b90bd5f31..ca97dae34 100644
--- a/pkg/generate/cleanup/resource.go
+++ b/pkg/generate/cleanup/resource.go
@@ -1,8 +1,8 @@
 package cleanup
 
 import (
-	kyvernoclient "github.com/nirmata/kyverno/pkg/client/clientset/versioned"
-	"github.com/nirmata/kyverno/pkg/config"
+	kyvernoclient "github.com/kyverno/kyverno/pkg/client/clientset/versioned"
+	"github.com/kyverno/kyverno/pkg/config"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
diff --git a/pkg/generate/controller.go b/pkg/generate/controller.go
index 2d3ef0ae0..432ff8353 100644
--- a/pkg/generate/controller.go
+++ b/pkg/generate/controller.go
@@ -1,17 +1,19 @@
 package generate
 
 import (
+	"time"
+
 	"github.com/go-logr/logr"
-	kyverno "github.com/nirmata/kyverno/pkg/api/kyverno/v1"
-	kyvernoclient "github.com/nirmata/kyverno/pkg/client/clientset/versioned"
-	kyvernoinformer "github.com/nirmata/kyverno/pkg/client/informers/externalversions/kyverno/v1"
-	kyvernolister "github.com/nirmata/kyverno/pkg/client/listers/kyverno/v1"
-	"github.com/nirmata/kyverno/pkg/config"
-	"github.com/nirmata/kyverno/pkg/constant"
-	dclient "github.com/nirmata/kyverno/pkg/dclient"
-	"github.com/nirmata/kyverno/pkg/event"
-	"github.com/nirmata/kyverno/pkg/policystatus"
-	"github.com/nirmata/kyverno/pkg/resourcecache"
+	kyverno "github.com/kyverno/kyverno/pkg/api/kyverno/v1"
+	kyvernoclient "github.com/kyverno/kyverno/pkg/client/clientset/versioned"
+	kyvernoinformer "github.com/kyverno/kyverno/pkg/client/informers/externalversions/kyverno/v1"
+	kyvernolister "github.com/kyverno/kyverno/pkg/client/listers/kyverno/v1"
+	"github.com/kyverno/kyverno/pkg/config"
+	"github.com/kyverno/kyverno/pkg/constant"
+	dclient "github.com/kyverno/kyverno/pkg/dclient"
+	"github.com/kyverno/kyverno/pkg/event"
+	"github.com/kyverno/kyverno/pkg/policystatus"
+	"github.com/kyverno/kyverno/pkg/resourcecache"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 	"k8s.io/apimachinery/pkg/util/wait"
@@ -19,7 +21,6 @@ import (
 	"k8s.io/client-go/informers"
 	"k8s.io/client-go/tools/cache"
 	"k8s.io/client-go/util/workqueue"
-	"time"
 )
 
 const (
diff --git a/pkg/generate/generate.go b/pkg/generate/generate.go
index a40f738f2..935489e7e 100644
--- a/pkg/generate/generate.go
+++ b/pkg/generate/generate.go
@@ -3,19 +3,20 @@ package generate
 import (
 	"encoding/json"
 	"fmt"
+	"reflect"
+	"time"
+
 	"github.com/go-logr/logr"
-	kyverno "github.com/nirmata/kyverno/pkg/api/kyverno/v1"
-	"github.com/nirmata/kyverno/pkg/config"
-	dclient "github.com/nirmata/kyverno/pkg/dclient"
-	"github.com/nirmata/kyverno/pkg/engine"
-	"github.com/nirmata/kyverno/pkg/engine/context"
-	"github.com/nirmata/kyverno/pkg/engine/validate"
-	"github.com/nirmata/kyverno/pkg/engine/variables"
+	kyverno "github.com/kyverno/kyverno/pkg/api/kyverno/v1"
+	"github.com/kyverno/kyverno/pkg/config"
+	dclient "github.com/kyverno/kyverno/pkg/dclient"
+	"github.com/kyverno/kyverno/pkg/engine"
+	"github.com/kyverno/kyverno/pkg/engine/context"
+	"github.com/kyverno/kyverno/pkg/engine/validate"
+	"github.com/kyverno/kyverno/pkg/engine/variables"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
-	"reflect"
-	"time"
 )
 
 func (c *Controller) processGR(gr *kyverno.GenerateRequest) error {
@@ -128,7 +129,6 @@ func (c *Controller) applyGenerate(resource unstructured.Unstructured, gr kyvern
 		}
 	}
 
-
 	// Apply the generate rule on resource
 	return c.applyGeneratePolicy(logger, policyContext, gr)
 }
diff --git a/pkg/generate/report.go b/pkg/generate/report.go
index 3cc786ed6..e8cb177ce 100644
--- a/pkg/generate/report.go
+++ b/pkg/generate/report.go
@@ -3,8 +3,8 @@ package generate
 import (
 	"fmt"
 
-	kyverno "github.com/nirmata/kyverno/pkg/api/kyverno/v1"
-	"github.com/nirmata/kyverno/pkg/event"
+	kyverno "github.com/kyverno/kyverno/pkg/api/kyverno/v1"
+	"github.com/kyverno/kyverno/pkg/event"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 )
 
diff --git a/pkg/generate/resource.go b/pkg/generate/resource.go
index c7348a22d..b0f0b8b8d 100644
--- a/pkg/generate/resource.go
+++ b/pkg/generate/resource.go
@@ -1,8 +1,8 @@
 package generate
 
 import (
-	kyverno "github.com/nirmata/kyverno/pkg/api/kyverno/v1"
-	dclient "github.com/nirmata/kyverno/pkg/dclient"
+	kyverno "github.com/kyverno/kyverno/pkg/api/kyverno/v1"
+	dclient "github.com/kyverno/kyverno/pkg/dclient"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 )
 
diff --git a/pkg/generate/status.go b/pkg/generate/status.go
index d42a9d906..99681c8c9 100644
--- a/pkg/generate/status.go
+++ b/pkg/generate/status.go
@@ -1,9 +1,9 @@
 package generate
 
 import (
-	kyverno "github.com/nirmata/kyverno/pkg/api/kyverno/v1"
-	kyvernoclient "github.com/nirmata/kyverno/pkg/client/clientset/versioned"
-	"github.com/nirmata/kyverno/pkg/config"
+	kyverno "github.com/kyverno/kyverno/pkg/api/kyverno/v1"
+	kyvernoclient "github.com/kyverno/kyverno/pkg/client/clientset/versioned"
+	"github.com/kyverno/kyverno/pkg/config"
 	"sigs.k8s.io/controller-runtime/pkg/log"
 )
 
diff --git a/pkg/kyverno/apply/command.go b/pkg/kyverno/apply/command.go
index 00c5fb757..69d0a831f 100644
--- a/pkg/kyverno/apply/command.go
+++ b/pkg/kyverno/apply/command.go
@@ -8,8 +8,8 @@ import (
 	"io/ioutil"
 	"reflect"
 
-	"github.com/nirmata/kyverno/pkg/engine/context"
-	"github.com/nirmata/kyverno/pkg/openapi"
+	"github.com/kyverno/kyverno/pkg/engine/context"
+	"github.com/kyverno/kyverno/pkg/openapi"
 	"k8s.io/apimachinery/pkg/util/yaml"
 
 	"os"
@@ -18,26 +18,26 @@ import (
 	"strings"
 	"time"
 
-	client "github.com/nirmata/kyverno/pkg/dclient"
+	client "github.com/kyverno/kyverno/pkg/dclient"
 
-	"github.com/nirmata/kyverno/pkg/utils"
+	"github.com/kyverno/kyverno/pkg/utils"
 
-	"github.com/nirmata/kyverno/pkg/kyverno/common"
-	"github.com/nirmata/kyverno/pkg/kyverno/sanitizedError"
+	"github.com/kyverno/kyverno/pkg/kyverno/common"
+	"github.com/kyverno/kyverno/pkg/kyverno/sanitizedError"
 
-	policy2 "github.com/nirmata/kyverno/pkg/policy"
+	policy2 "github.com/kyverno/kyverno/pkg/policy"
 
 	"k8s.io/apimachinery/pkg/runtime/schema"
 
-	"github.com/nirmata/kyverno/pkg/engine"
+	"github.com/kyverno/kyverno/pkg/engine"
 
-	engineutils "github.com/nirmata/kyverno/pkg/engine/utils"
+	engineutils "github.com/kyverno/kyverno/pkg/engine/utils"
 
 	"k8s.io/apimachinery/pkg/runtime"
 
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 
-	v1 "github.com/nirmata/kyverno/pkg/api/kyverno/v1"
+	v1 "github.com/kyverno/kyverno/pkg/api/kyverno/v1"
 	"github.com/spf13/cobra"
 	yamlv2 "gopkg.in/yaml.v2"
 	"k8s.io/cli-runtime/pkg/genericclioptions"
diff --git a/pkg/kyverno/common/common.go b/pkg/kyverno/common/common.go
index bf87909b9..5f594547f 100644
--- a/pkg/kyverno/common/common.go
+++ b/pkg/kyverno/common/common.go
@@ -18,10 +18,10 @@ import (
 
 	jsonpatch "github.com/evanphx/json-patch"
 	"github.com/go-logr/logr"
-	v1 "github.com/nirmata/kyverno/pkg/api/kyverno/v1"
-	"github.com/nirmata/kyverno/pkg/kyverno/sanitizedError"
-	"github.com/nirmata/kyverno/pkg/policymutation"
-	"github.com/nirmata/kyverno/pkg/utils"
+	v1 "github.com/kyverno/kyverno/pkg/api/kyverno/v1"
+	"github.com/kyverno/kyverno/pkg/kyverno/sanitizedError"
+	"github.com/kyverno/kyverno/pkg/policymutation"
+	"github.com/kyverno/kyverno/pkg/utils"
 	log "sigs.k8s.io/controller-runtime/pkg/log"
 )
 
diff --git a/pkg/kyverno/main.go b/pkg/kyverno/main.go
index 6424a57dd..fa7ddccf0 100644
--- a/pkg/kyverno/main.go
+++ b/pkg/kyverno/main.go
@@ -4,11 +4,11 @@ import (
 	"flag"
 	"os"
 
-	"github.com/nirmata/kyverno/pkg/kyverno/validate"
+	"github.com/kyverno/kyverno/pkg/kyverno/validate"
 
-	"github.com/nirmata/kyverno/pkg/kyverno/apply"
+	"github.com/kyverno/kyverno/pkg/kyverno/apply"
 
-	"github.com/nirmata/kyverno/pkg/kyverno/version"
+	"github.com/kyverno/kyverno/pkg/kyverno/version"
 	"k8s.io/klog"
 	"k8s.io/klog/klogr"
 	log "sigs.k8s.io/controller-runtime/pkg/log"
diff --git a/pkg/kyverno/validate/command.go b/pkg/kyverno/validate/command.go
index 99126c6fc..17c0c4efe 100644
--- a/pkg/kyverno/validate/command.go
+++ b/pkg/kyverno/validate/command.go
@@ -7,14 +7,14 @@ import (
 	"fmt"
 	"os"
 
-	v1 "github.com/nirmata/kyverno/pkg/api/kyverno/v1"
-	"github.com/nirmata/kyverno/pkg/openapi"
-	"github.com/nirmata/kyverno/pkg/utils"
+	v1 "github.com/kyverno/kyverno/pkg/api/kyverno/v1"
+	"github.com/kyverno/kyverno/pkg/openapi"
+	"github.com/kyverno/kyverno/pkg/utils"
 
-	"github.com/nirmata/kyverno/pkg/kyverno/common"
-	"github.com/nirmata/kyverno/pkg/kyverno/sanitizedError"
+	"github.com/kyverno/kyverno/pkg/kyverno/common"
+	"github.com/kyverno/kyverno/pkg/kyverno/sanitizedError"
 
-	policy2 "github.com/nirmata/kyverno/pkg/policy"
+	policy2 "github.com/kyverno/kyverno/pkg/policy"
 	"github.com/spf13/cobra"
 
 	_ "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/validation"
diff --git a/pkg/kyverno/version/command.go b/pkg/kyverno/version/command.go
index 25d1324f2..63377c615 100644
--- a/pkg/kyverno/version/command.go
+++ b/pkg/kyverno/version/command.go
@@ -3,7 +3,7 @@ package version
 import (
 	"fmt"
 
-	"github.com/nirmata/kyverno/pkg/version"
+	"github.com/kyverno/kyverno/pkg/version"
 	"github.com/spf13/cobra"
 )
 
diff --git a/pkg/openapi/crdSync.go b/pkg/openapi/crdSync.go
index ff1b3727a..f425f625d 100644
--- a/pkg/openapi/crdSync.go
+++ b/pkg/openapi/crdSync.go
@@ -19,8 +19,8 @@ import (
 	"github.com/googleapis/gnostic/compiler"
 
 	openapi_v2 "github.com/googleapis/gnostic/OpenAPIv2"
-	"github.com/nirmata/kyverno/pkg/constant"
-	client "github.com/nirmata/kyverno/pkg/dclient"
+	"github.com/kyverno/kyverno/pkg/constant"
+	client "github.com/kyverno/kyverno/pkg/dclient"
 	"k8s.io/apimachinery/pkg/util/wait"
 )
 
diff --git a/pkg/openapi/validation.go b/pkg/openapi/validation.go
index 895bc27ae..af05bae0b 100644
--- a/pkg/openapi/validation.go
+++ b/pkg/openapi/validation.go
@@ -8,13 +8,13 @@ import (
 	"strings"
 	"sync"
 
-	data "github.com/nirmata/kyverno/api"
-	"github.com/nirmata/kyverno/pkg/engine/utils"
+	data "github.com/kyverno/kyverno/api"
+	"github.com/kyverno/kyverno/pkg/engine/utils"
 
-	"github.com/nirmata/kyverno/pkg/engine"
+	"github.com/kyverno/kyverno/pkg/engine"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 
-	v1 "github.com/nirmata/kyverno/pkg/api/kyverno/v1"
+	v1 "github.com/kyverno/kyverno/pkg/api/kyverno/v1"
 
 	openapi_v2 "github.com/googleapis/gnostic/OpenAPIv2"
 	"github.com/googleapis/gnostic/compiler"
diff --git a/pkg/policy/actions.go b/pkg/policy/actions.go
index 4442113cd..8a1f6c8ba 100644
--- a/pkg/policy/actions.go
+++ b/pkg/policy/actions.go
@@ -3,11 +3,11 @@ package policy
 import (
 	"fmt"
 
-	kyverno "github.com/nirmata/kyverno/pkg/api/kyverno/v1"
-	dclient "github.com/nirmata/kyverno/pkg/dclient"
-	"github.com/nirmata/kyverno/pkg/policy/generate"
-	"github.com/nirmata/kyverno/pkg/policy/mutate"
-	"github.com/nirmata/kyverno/pkg/policy/validate"
+	kyverno "github.com/kyverno/kyverno/pkg/api/kyverno/v1"
+	dclient "github.com/kyverno/kyverno/pkg/dclient"
+	"github.com/kyverno/kyverno/pkg/policy/generate"
+	"github.com/kyverno/kyverno/pkg/policy/mutate"
+	"github.com/kyverno/kyverno/pkg/policy/validate"
 	"sigs.k8s.io/controller-runtime/pkg/log"
 )
 
diff --git a/pkg/policy/apply.go b/pkg/policy/apply.go
index 25072f794..525723b0a 100644
--- a/pkg/policy/apply.go
+++ b/pkg/policy/apply.go
@@ -9,12 +9,12 @@ import (
 
 	jsonpatch "github.com/evanphx/json-patch"
 	"github.com/go-logr/logr"
-	kyverno "github.com/nirmata/kyverno/pkg/api/kyverno/v1"
-	"github.com/nirmata/kyverno/pkg/engine"
-	"github.com/nirmata/kyverno/pkg/engine/context"
-	"github.com/nirmata/kyverno/pkg/engine/response"
-	"github.com/nirmata/kyverno/pkg/resourcecache"
-	"github.com/nirmata/kyverno/pkg/utils"
+	kyverno "github.com/kyverno/kyverno/pkg/api/kyverno/v1"
+	"github.com/kyverno/kyverno/pkg/engine"
+	"github.com/kyverno/kyverno/pkg/engine/context"
+	"github.com/kyverno/kyverno/pkg/engine/response"
+	"github.com/kyverno/kyverno/pkg/resourcecache"
+	"github.com/kyverno/kyverno/pkg/utils"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 )
 
diff --git a/pkg/policy/background.go b/pkg/policy/background.go
index cf9c22279..8cb73648d 100644
--- a/pkg/policy/background.go
+++ b/pkg/policy/background.go
@@ -3,9 +3,9 @@ package policy
 import (
 	"fmt"
 
-	kyverno "github.com/nirmata/kyverno/pkg/api/kyverno/v1"
-	"github.com/nirmata/kyverno/pkg/engine/context"
-	"github.com/nirmata/kyverno/pkg/engine/variables"
+	kyverno "github.com/kyverno/kyverno/pkg/api/kyverno/v1"
+	"github.com/kyverno/kyverno/pkg/engine/context"
+	"github.com/kyverno/kyverno/pkg/engine/variables"
 	"sigs.k8s.io/controller-runtime/pkg/log"
 )
 
diff --git a/pkg/policy/cleanup.go b/pkg/policy/cleanup.go
index 0cfc84199..efb906c1a 100644
--- a/pkg/policy/cleanup.go
+++ b/pkg/policy/cleanup.go
@@ -5,9 +5,9 @@ import (
 	"reflect"
 
 	"github.com/go-logr/logr"
-	kyverno "github.com/nirmata/kyverno/pkg/api/kyverno/v1"
-	kyvernolister "github.com/nirmata/kyverno/pkg/client/listers/kyverno/v1"
-	"github.com/nirmata/kyverno/pkg/engine/response"
+	kyverno "github.com/kyverno/kyverno/pkg/api/kyverno/v1"
+	kyvernolister "github.com/kyverno/kyverno/pkg/client/listers/kyverno/v1"
+	"github.com/kyverno/kyverno/pkg/engine/response"
 	"k8s.io/apimachinery/pkg/labels"
 )
 
diff --git a/pkg/policy/clusterpv.go b/pkg/policy/clusterpv.go
index fb6f87564..473266eff 100644
--- a/pkg/policy/clusterpv.go
+++ b/pkg/policy/clusterpv.go
@@ -1,7 +1,7 @@
 package policy
 
 import (
-	kyverno "github.com/nirmata/kyverno/pkg/api/kyverno/v1"
+	kyverno "github.com/kyverno/kyverno/pkg/api/kyverno/v1"
 	"k8s.io/client-go/tools/cache"
 )
 
diff --git a/pkg/policy/common.go b/pkg/policy/common.go
index 88697176e..2029e7cd5 100644
--- a/pkg/policy/common.go
+++ b/pkg/policy/common.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	kyverno "github.com/nirmata/kyverno/pkg/api/kyverno/v1"
+	kyverno "github.com/kyverno/kyverno/pkg/api/kyverno/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/labels"
diff --git a/pkg/policy/common/common.go b/pkg/policy/common/common.go
index 18df2746d..212dd3ad6 100644
--- a/pkg/policy/common/common.go
+++ b/pkg/policy/common/common.go
@@ -5,7 +5,7 @@ import (
 	"regexp"
 	"strconv"
 
-	commonAnchors "github.com/nirmata/kyverno/pkg/engine/anchor/common"
+	commonAnchors "github.com/kyverno/kyverno/pkg/engine/anchor/common"
 )
 
 //ValidatePattern validates the pattern
diff --git a/pkg/policy/controller.go b/pkg/policy/controller.go
index 242a2b678..e334965cd 100644
--- a/pkg/policy/controller.go
+++ b/pkg/policy/controller.go
@@ -2,25 +2,26 @@ package policy
 
 import (
 	"fmt"
-	"k8s.io/apimachinery/pkg/labels"
 	"math/rand"
 	"time"
 
+	"k8s.io/apimachinery/pkg/labels"
+
 	informers "k8s.io/client-go/informers/core/v1"
 
 	"github.com/go-logr/logr"
-	kyverno "github.com/nirmata/kyverno/pkg/api/kyverno/v1"
-	kyvernoclient "github.com/nirmata/kyverno/pkg/client/clientset/versioned"
-	"github.com/nirmata/kyverno/pkg/client/clientset/versioned/scheme"
-	kyvernoinformer "github.com/nirmata/kyverno/pkg/client/informers/externalversions/kyverno/v1"
-	kyvernolister "github.com/nirmata/kyverno/pkg/client/listers/kyverno/v1"
-	"github.com/nirmata/kyverno/pkg/config"
-	"github.com/nirmata/kyverno/pkg/constant"
-	client "github.com/nirmata/kyverno/pkg/dclient"
-	"github.com/nirmata/kyverno/pkg/event"
-	"github.com/nirmata/kyverno/pkg/policyviolation"
-	"github.com/nirmata/kyverno/pkg/resourcecache"
-	"github.com/nirmata/kyverno/pkg/webhookconfig"
+	kyverno "github.com/kyverno/kyverno/pkg/api/kyverno/v1"
+	kyvernoclient "github.com/kyverno/kyverno/pkg/client/clientset/versioned"
+	"github.com/kyverno/kyverno/pkg/client/clientset/versioned/scheme"
+	kyvernoinformer "github.com/kyverno/kyverno/pkg/client/informers/externalversions/kyverno/v1"
+	kyvernolister "github.com/kyverno/kyverno/pkg/client/listers/kyverno/v1"
+	"github.com/kyverno/kyverno/pkg/config"
+	"github.com/kyverno/kyverno/pkg/constant"
+	client "github.com/kyverno/kyverno/pkg/dclient"
+	"github.com/kyverno/kyverno/pkg/event"
+	"github.com/kyverno/kyverno/pkg/policyviolation"
+	"github.com/kyverno/kyverno/pkg/resourcecache"
+	"github.com/kyverno/kyverno/pkg/webhookconfig"
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
diff --git a/pkg/policy/existing.go b/pkg/policy/existing.go
index 2ec6fa871..d94e4e17a 100644
--- a/pkg/policy/existing.go
+++ b/pkg/policy/existing.go
@@ -9,13 +9,13 @@ import (
 	listerv1 "k8s.io/client-go/listers/core/v1"
 
 	"github.com/go-logr/logr"
+	kyverno "github.com/kyverno/kyverno/pkg/api/kyverno/v1"
+	"github.com/kyverno/kyverno/pkg/config"
+	client "github.com/kyverno/kyverno/pkg/dclient"
+	"github.com/kyverno/kyverno/pkg/engine"
+	"github.com/kyverno/kyverno/pkg/engine/response"
+	"github.com/kyverno/kyverno/pkg/utils"
 	"github.com/minio/minio/pkg/wildcard"
-	kyverno "github.com/nirmata/kyverno/pkg/api/kyverno/v1"
-	"github.com/nirmata/kyverno/pkg/config"
-	client "github.com/nirmata/kyverno/pkg/dclient"
-	"github.com/nirmata/kyverno/pkg/engine"
-	"github.com/nirmata/kyverno/pkg/engine/response"
-	"github.com/nirmata/kyverno/pkg/utils"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/labels"
diff --git a/pkg/policy/generate/auth.go b/pkg/policy/generate/auth.go
index 3da64a428..00ecfd792 100644
--- a/pkg/policy/generate/auth.go
+++ b/pkg/policy/generate/auth.go
@@ -2,8 +2,8 @@ package generate
 
 import (
 	"github.com/go-logr/logr"
-	"github.com/nirmata/kyverno/pkg/auth"
-	dclient "github.com/nirmata/kyverno/pkg/dclient"
+	"github.com/kyverno/kyverno/pkg/auth"
+	dclient "github.com/kyverno/kyverno/pkg/dclient"
 )
 
 //Operations provides methods to performing operations on resource
diff --git a/pkg/policy/generate/fake.go b/pkg/policy/generate/fake.go
index 22fcd408e..13ca84457 100644
--- a/pkg/policy/generate/fake.go
+++ b/pkg/policy/generate/fake.go
@@ -1,8 +1,8 @@
 package generate
 
 import (
-	kyverno "github.com/nirmata/kyverno/pkg/api/kyverno/v1"
-	"github.com/nirmata/kyverno/pkg/policy/generate/fake"
+	kyverno "github.com/kyverno/kyverno/pkg/api/kyverno/v1"
+	"github.com/kyverno/kyverno/pkg/policy/generate/fake"
 	"sigs.k8s.io/controller-runtime/pkg/log"
 )
 
diff --git a/pkg/policy/generate/validate.go b/pkg/policy/generate/validate.go
index 827c1afd0..aa3d20ac9 100644
--- a/pkg/policy/generate/validate.go
+++ b/pkg/policy/generate/validate.go
@@ -5,11 +5,11 @@ import (
 	"reflect"
 
 	"github.com/go-logr/logr"
-	kyverno "github.com/nirmata/kyverno/pkg/api/kyverno/v1"
-	dclient "github.com/nirmata/kyverno/pkg/dclient"
-	commonAnchors "github.com/nirmata/kyverno/pkg/engine/anchor/common"
-	"github.com/nirmata/kyverno/pkg/engine/variables"
-	"github.com/nirmata/kyverno/pkg/policy/common"
+	kyverno "github.com/kyverno/kyverno/pkg/api/kyverno/v1"
+	dclient "github.com/kyverno/kyverno/pkg/dclient"
+	commonAnchors "github.com/kyverno/kyverno/pkg/engine/anchor/common"
+	"github.com/kyverno/kyverno/pkg/engine/variables"
+	"github.com/kyverno/kyverno/pkg/policy/common"
 )
 
 // Generate provides implementation to validate 'generate' rule
@@ -67,7 +67,7 @@ func (g *Generate) Validate() (string, error) {
 
 	// Kyverno generate-controller create/update/deletes the resources specified in generate rule of policy
 	// kyverno uses SA 'kyverno-service-account' and has default ClusterRoles and ClusterRoleBindings
-	// instuctions to modify the RBAC for kyverno are mentioned at https://github.com/nirmata/kyverno/blob/master/documentation/installation.md
+	// instuctions to modify the RBAC for kyverno are mentioned at https://github.com/kyverno/kyverno/blob/master/documentation/installation.md
 	// - operations required: create/update/delete/get
 	// If kind and namespace contain variables, then we cannot resolve then so we skip the processing
 	if err := g.canIGenerate(kind, namespace); err != nil {
diff --git a/pkg/policy/mutate/validate.go b/pkg/policy/mutate/validate.go
index 8932e9200..8187ea9ca 100644
--- a/pkg/policy/mutate/validate.go
+++ b/pkg/policy/mutate/validate.go
@@ -4,9 +4,9 @@ import (
 	"errors"
 	"fmt"
 
-	kyverno "github.com/nirmata/kyverno/pkg/api/kyverno/v1"
-	commonAnchors "github.com/nirmata/kyverno/pkg/engine/anchor/common"
-	"github.com/nirmata/kyverno/pkg/policy/common"
+	kyverno "github.com/kyverno/kyverno/pkg/api/kyverno/v1"
+	commonAnchors "github.com/kyverno/kyverno/pkg/engine/anchor/common"
+	"github.com/kyverno/kyverno/pkg/policy/common"
 )
 
 // Mutate provides implementation to validate 'mutate' rule
diff --git a/pkg/policy/namespacedpv.go b/pkg/policy/namespacedpv.go
index 171683755..6c35fefd6 100644
--- a/pkg/policy/namespacedpv.go
+++ b/pkg/policy/namespacedpv.go
@@ -1,7 +1,7 @@
 package policy
 
 import (
-	kyverno "github.com/nirmata/kyverno/pkg/api/kyverno/v1"
+	kyverno "github.com/kyverno/kyverno/pkg/api/kyverno/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	cache "k8s.io/client-go/tools/cache"
 )
diff --git a/pkg/policy/report.go b/pkg/policy/report.go
index 54f5142dc..300989c3c 100644
--- a/pkg/policy/report.go
+++ b/pkg/policy/report.go
@@ -4,9 +4,9 @@ import (
 	"fmt"
 
 	"github.com/go-logr/logr"
-	"github.com/nirmata/kyverno/pkg/engine/response"
-	"github.com/nirmata/kyverno/pkg/event"
-	"github.com/nirmata/kyverno/pkg/policyviolation"
+	"github.com/kyverno/kyverno/pkg/engine/response"
+	"github.com/kyverno/kyverno/pkg/event"
+	"github.com/kyverno/kyverno/pkg/policyviolation"
 )
 
 // for each policy-resource response
diff --git a/pkg/policy/validate.go b/pkg/policy/validate.go
index bc378d14d..af1b98098 100644
--- a/pkg/policy/validate.go
+++ b/pkg/policy/validate.go
@@ -7,14 +7,14 @@ import (
 	"reflect"
 	"strings"
 
-	"github.com/nirmata/kyverno/pkg/kyverno/common"
+	"github.com/kyverno/kyverno/pkg/kyverno/common"
 
 	"github.com/minio/minio/pkg/wildcard"
 
-	"github.com/nirmata/kyverno/pkg/openapi"
+	"github.com/kyverno/kyverno/pkg/openapi"
 
-	kyverno "github.com/nirmata/kyverno/pkg/api/kyverno/v1"
-	dclient "github.com/nirmata/kyverno/pkg/dclient"
+	kyverno "github.com/kyverno/kyverno/pkg/api/kyverno/v1"
+	dclient "github.com/kyverno/kyverno/pkg/dclient"
 	rbacv1 "k8s.io/api/rbac/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
diff --git a/pkg/policy/validate/validate.go b/pkg/policy/validate/validate.go
index 909380fe5..e988afc1e 100644
--- a/pkg/policy/validate/validate.go
+++ b/pkg/policy/validate/validate.go
@@ -3,9 +3,9 @@ package validate
 import (
 	"fmt"
 
-	kyverno "github.com/nirmata/kyverno/pkg/api/kyverno/v1"
-	commonAnchors "github.com/nirmata/kyverno/pkg/engine/anchor/common"
-	"github.com/nirmata/kyverno/pkg/policy/common"
+	kyverno "github.com/kyverno/kyverno/pkg/api/kyverno/v1"
+	commonAnchors "github.com/kyverno/kyverno/pkg/engine/anchor/common"
+	"github.com/kyverno/kyverno/pkg/policy/common"
 )
 
 // Validate provides implementation to validate 'validate' rule
diff --git a/pkg/policycache/cache.go b/pkg/policycache/cache.go
index 67aa43a19..10fb03318 100644
--- a/pkg/policycache/cache.go
+++ b/pkg/policycache/cache.go
@@ -4,7 +4,7 @@ import (
 	"sync"
 
 	"github.com/go-logr/logr"
-	kyverno "github.com/nirmata/kyverno/pkg/api/kyverno/v1"
+	kyverno "github.com/kyverno/kyverno/pkg/api/kyverno/v1"
 )
 
 type pMap struct {
diff --git a/pkg/policycache/informer.go b/pkg/policycache/informer.go
index 1ba73fbd9..51c38f19e 100644
--- a/pkg/policycache/informer.go
+++ b/pkg/policycache/informer.go
@@ -4,8 +4,8 @@ import (
 	"reflect"
 
 	"github.com/go-logr/logr"
-	kyverno "github.com/nirmata/kyverno/pkg/api/kyverno/v1"
-	kyvernoinformer "github.com/nirmata/kyverno/pkg/client/informers/externalversions/kyverno/v1"
+	kyverno "github.com/kyverno/kyverno/pkg/api/kyverno/v1"
+	kyvernoinformer "github.com/kyverno/kyverno/pkg/client/informers/externalversions/kyverno/v1"
 	"k8s.io/client-go/tools/cache"
 )
 
diff --git a/pkg/policymutation/cronjob.go b/pkg/policymutation/cronjob.go
index 68d62ad64..0bdb96ee0 100644
--- a/pkg/policymutation/cronjob.go
+++ b/pkg/policymutation/cronjob.go
@@ -6,8 +6,8 @@ import (
 	"strings"
 
 	"github.com/go-logr/logr"
-	kyverno "github.com/nirmata/kyverno/pkg/api/kyverno/v1"
-	"github.com/nirmata/kyverno/pkg/engine"
+	kyverno "github.com/kyverno/kyverno/pkg/api/kyverno/v1"
+	"github.com/kyverno/kyverno/pkg/engine"
 )
 
 func generateCronJobRule(rule kyverno.Rule, controllers string, log logr.Logger) kyvernoRule {
diff --git a/pkg/policymutation/policymutation.go b/pkg/policymutation/policymutation.go
index 606618b63..b78d24b5e 100644
--- a/pkg/policymutation/policymutation.go
+++ b/pkg/policymutation/policymutation.go
@@ -10,11 +10,11 @@ import (
 
 	jsonpatch "github.com/evanphx/json-patch"
 	"github.com/go-logr/logr"
-	"github.com/nirmata/kyverno/pkg/common"
-	"github.com/nirmata/kyverno/pkg/engine"
-	"github.com/nirmata/kyverno/pkg/utils"
+	"github.com/kyverno/kyverno/pkg/common"
+	"github.com/kyverno/kyverno/pkg/engine"
+	"github.com/kyverno/kyverno/pkg/utils"
 
-	kyverno "github.com/nirmata/kyverno/pkg/api/kyverno/v1"
+	kyverno "github.com/kyverno/kyverno/pkg/api/kyverno/v1"
 )
 
 func GenerateJSONPatchesForDefaults(policy *kyverno.ClusterPolicy, log logr.Logger) ([]byte, []string) {
@@ -351,8 +351,8 @@ func generateRulePatches(policy kyverno.ClusterPolicy, controllers string, log l
 // otherwise (without the pointer), it will be set to empty value
 // - an empty struct in this case, some may fail the schema validation
 // TODO(shuting) may related to:
-// https://github.com/nirmata/kyverno/pull/549#discussion_r360088556
-// https://github.com/nirmata/kyverno/issues/568
+// https://github.com/kyverno/kyverno/pull/549#discussion_r360088556
+// https://github.com/kyverno/kyverno/issues/568
 
 type kyvernoRule struct {
 	Name             string                    `json:"name"`
diff --git a/pkg/policystatus/main.go b/pkg/policystatus/main.go
index c4edd70d3..71a8975b3 100644
--- a/pkg/policystatus/main.go
+++ b/pkg/policystatus/main.go
@@ -7,9 +7,9 @@ import (
 	"sync"
 	"time"
 
-	v1 "github.com/nirmata/kyverno/pkg/api/kyverno/v1"
-	"github.com/nirmata/kyverno/pkg/client/clientset/versioned"
-	kyvernolister "github.com/nirmata/kyverno/pkg/client/listers/kyverno/v1"
+	v1 "github.com/kyverno/kyverno/pkg/api/kyverno/v1"
+	"github.com/kyverno/kyverno/pkg/client/clientset/versioned"
+	kyvernolister "github.com/kyverno/kyverno/pkg/client/listers/kyverno/v1"
 	"k8s.io/apimachinery/pkg/util/wait"
 	log "sigs.k8s.io/controller-runtime/pkg/log"
 )
diff --git a/pkg/policyviolation/builder.go b/pkg/policyviolation/builder.go
index e7dbf97ee..c2b4e6ce0 100644
--- a/pkg/policyviolation/builder.go
+++ b/pkg/policyviolation/builder.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 
 	"github.com/go-logr/logr"
-	kyverno "github.com/nirmata/kyverno/pkg/api/kyverno/v1"
-	"github.com/nirmata/kyverno/pkg/engine/response"
+	kyverno "github.com/kyverno/kyverno/pkg/api/kyverno/v1"
+	"github.com/kyverno/kyverno/pkg/engine/response"
 )
 
 //GeneratePVsFromEngineResponse generate Violations from engine responses
diff --git a/pkg/policyviolation/clusterpv.go b/pkg/policyviolation/clusterpv.go
index 6ddbe7e05..984842c90 100644
--- a/pkg/policyviolation/clusterpv.go
+++ b/pkg/policyviolation/clusterpv.go
@@ -4,11 +4,11 @@ import (
 	"fmt"
 
 	"github.com/go-logr/logr"
-	kyverno "github.com/nirmata/kyverno/pkg/api/kyverno/v1"
-	kyvernov1 "github.com/nirmata/kyverno/pkg/client/clientset/versioned/typed/kyverno/v1"
-	kyvernolister "github.com/nirmata/kyverno/pkg/client/listers/kyverno/v1"
-	client "github.com/nirmata/kyverno/pkg/dclient"
-	"github.com/nirmata/kyverno/pkg/policystatus"
+	kyverno "github.com/kyverno/kyverno/pkg/api/kyverno/v1"
+	kyvernov1 "github.com/kyverno/kyverno/pkg/client/clientset/versioned/typed/kyverno/v1"
+	kyvernolister "github.com/kyverno/kyverno/pkg/client/listers/kyverno/v1"
+	client "github.com/kyverno/kyverno/pkg/dclient"
+	"github.com/kyverno/kyverno/pkg/policystatus"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
diff --git a/pkg/policyviolation/common.go b/pkg/policyviolation/common.go
index 1b6271206..6fb203b01 100644
--- a/pkg/policyviolation/common.go
+++ b/pkg/policyviolation/common.go
@@ -6,9 +6,9 @@ import (
 	"time"
 
 	backoff "github.com/cenkalti/backoff"
-	kyverno "github.com/nirmata/kyverno/pkg/api/kyverno/v1"
-	v1 "github.com/nirmata/kyverno/pkg/api/kyverno/v1"
-	client "github.com/nirmata/kyverno/pkg/dclient"
+	kyverno "github.com/kyverno/kyverno/pkg/api/kyverno/v1"
+	v1 "github.com/kyverno/kyverno/pkg/api/kyverno/v1"
+	client "github.com/kyverno/kyverno/pkg/dclient"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	unstructured "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/labels"
diff --git a/pkg/policyviolation/generator.go b/pkg/policyviolation/generator.go
index c574f9fb0..0463da52e 100644
--- a/pkg/policyviolation/generator.go
+++ b/pkg/policyviolation/generator.go
@@ -8,15 +8,15 @@ import (
 	"sync"
 
 	"github.com/go-logr/logr"
-	kyverno "github.com/nirmata/kyverno/pkg/api/kyverno/v1"
-	kyvernoclient "github.com/nirmata/kyverno/pkg/client/clientset/versioned"
-	kyvernov1 "github.com/nirmata/kyverno/pkg/client/clientset/versioned/typed/kyverno/v1"
-	kyvernoinformer "github.com/nirmata/kyverno/pkg/client/informers/externalversions/kyverno/v1"
-	kyvernolister "github.com/nirmata/kyverno/pkg/client/listers/kyverno/v1"
-	"github.com/nirmata/kyverno/pkg/constant"
-	"github.com/nirmata/kyverno/pkg/policystatus"
-
-	dclient "github.com/nirmata/kyverno/pkg/dclient"
+	kyverno "github.com/kyverno/kyverno/pkg/api/kyverno/v1"
+	kyvernoclient "github.com/kyverno/kyverno/pkg/client/clientset/versioned"
+	kyvernov1 "github.com/kyverno/kyverno/pkg/client/clientset/versioned/typed/kyverno/v1"
+	kyvernoinformer "github.com/kyverno/kyverno/pkg/client/informers/externalversions/kyverno/v1"
+	kyvernolister "github.com/kyverno/kyverno/pkg/client/listers/kyverno/v1"
+	"github.com/kyverno/kyverno/pkg/constant"
+	"github.com/kyverno/kyverno/pkg/policystatus"
+
+	dclient "github.com/kyverno/kyverno/pkg/dclient"
 	unstructured "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 	"k8s.io/apimachinery/pkg/util/wait"
diff --git a/pkg/policyviolation/namespacedpv.go b/pkg/policyviolation/namespacedpv.go
index 5352e2a23..f4112960c 100644
--- a/pkg/policyviolation/namespacedpv.go
+++ b/pkg/policyviolation/namespacedpv.go
@@ -4,11 +4,11 @@ import (
 	"fmt"
 
 	"github.com/go-logr/logr"
-	kyverno "github.com/nirmata/kyverno/pkg/api/kyverno/v1"
-	kyvernov1 "github.com/nirmata/kyverno/pkg/client/clientset/versioned/typed/kyverno/v1"
-	kyvernolister "github.com/nirmata/kyverno/pkg/client/listers/kyverno/v1"
-	client "github.com/nirmata/kyverno/pkg/dclient"
-	"github.com/nirmata/kyverno/pkg/policystatus"
+	kyverno "github.com/kyverno/kyverno/pkg/api/kyverno/v1"
+	kyvernov1 "github.com/kyverno/kyverno/pkg/client/clientset/versioned/typed/kyverno/v1"
+	kyvernolister "github.com/kyverno/kyverno/pkg/client/listers/kyverno/v1"
+	client "github.com/kyverno/kyverno/pkg/dclient"
+	"github.com/kyverno/kyverno/pkg/policystatus"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
diff --git a/pkg/resourcecache/main.go b/pkg/resourcecache/main.go
index c34738088..ae843d301 100644
--- a/pkg/resourcecache/main.go
+++ b/pkg/resourcecache/main.go
@@ -4,7 +4,7 @@ import (
 	// "fmt"
 	// "time"
 	"github.com/go-logr/logr"
-	dclient "github.com/nirmata/kyverno/pkg/dclient"
+	dclient "github.com/kyverno/kyverno/pkg/dclient"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/client-go/discovery"
 	"k8s.io/client-go/dynamic/dynamicinformer"
diff --git a/pkg/tls/tls.go b/pkg/tls/tls.go
index 4acc08272..e3cd9a94d 100644
--- a/pkg/tls/tls.go
+++ b/pkg/tls/tls.go
@@ -62,7 +62,7 @@ func CertificateGenerateRequest(privateKey *rsa.PrivateKey, props TlsCertificate
 	dnsNames[2] = commonName
 	csCommonName := props.Service
 	if fqdncn {
-		// use FQDN as CommonName as a workaournd for https://github.com/nirmata/kyverno/issues/542
+		// use FQDN as CommonName as a workaournd for https://github.com/kyverno/kyverno/issues/542
 		csCommonName = commonName
 	}
 	var ips []net.IP
diff --git a/pkg/userinfo/roleRef.go b/pkg/userinfo/roleRef.go
index aa92ed72a..2afc8975d 100644
--- a/pkg/userinfo/roleRef.go
+++ b/pkg/userinfo/roleRef.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/nirmata/kyverno/pkg/config"
-	"github.com/nirmata/kyverno/pkg/utils"
+	"github.com/kyverno/kyverno/pkg/config"
+	"github.com/kyverno/kyverno/pkg/utils"
 	v1beta1 "k8s.io/api/admission/v1beta1"
 	authenticationv1 "k8s.io/api/authentication/v1"
 	rbacv1 "k8s.io/api/rbac/v1"
diff --git a/pkg/utils/json.go b/pkg/utils/json.go
index 23eec81ff..b4675b5a7 100644
--- a/pkg/utils/json.go
+++ b/pkg/utils/json.go
@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"reflect"
 
-	v1 "github.com/nirmata/kyverno/pkg/api/kyverno/v1"
+	v1 "github.com/kyverno/kyverno/pkg/api/kyverno/v1"
 )
 
 // JoinPatches joins array of serialized JSON patches to the single JSONPatch array
diff --git a/pkg/utils/loadpolicy.go b/pkg/utils/loadpolicy.go
index ad21b3216..e749be4c5 100644
--- a/pkg/utils/loadpolicy.go
+++ b/pkg/utils/loadpolicy.go
@@ -7,7 +7,7 @@ import (
 	"fmt"
 	"io"
 
-	v1 "github.com/nirmata/kyverno/pkg/api/kyverno/v1"
+	v1 "github.com/kyverno/kyverno/pkg/api/kyverno/v1"
 	"k8s.io/apimachinery/pkg/util/yaml"
 )
 
diff --git a/pkg/utils/util.go b/pkg/utils/util.go
index 4cd2f7836..385fafba3 100644
--- a/pkg/utils/util.go
+++ b/pkg/utils/util.go
@@ -6,14 +6,14 @@ import (
 	"regexp"
 	"strconv"
 
-	engineutils "github.com/nirmata/kyverno/pkg/engine/utils"
+	engineutils "github.com/kyverno/kyverno/pkg/engine/utils"
 	"k8s.io/api/admission/v1beta1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 
 	"github.com/go-logr/logr"
+	client "github.com/kyverno/kyverno/pkg/dclient"
+	dclient "github.com/kyverno/kyverno/pkg/dclient"
 	"github.com/minio/minio/pkg/wildcard"
-	client "github.com/nirmata/kyverno/pkg/dclient"
-	dclient "github.com/nirmata/kyverno/pkg/dclient"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"
diff --git a/pkg/webhookconfig/checker.go b/pkg/webhookconfig/checker.go
index 9275ca5d7..2fe801250 100644
--- a/pkg/webhookconfig/checker.go
+++ b/pkg/webhookconfig/checker.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"sync"
 
-	"github.com/nirmata/kyverno/pkg/config"
+	"github.com/kyverno/kyverno/pkg/config"
 	admregapi "k8s.io/api/admissionregistration/v1beta1"
 	errorsapi "k8s.io/apimachinery/pkg/api/errors"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
diff --git a/pkg/webhookconfig/common.go b/pkg/webhookconfig/common.go
index 7a7cee051..1035956cc 100644
--- a/pkg/webhookconfig/common.go
+++ b/pkg/webhookconfig/common.go
@@ -3,7 +3,7 @@ package webhookconfig
 import (
 	"io/ioutil"
 
-	"github.com/nirmata/kyverno/pkg/config"
+	"github.com/kyverno/kyverno/pkg/config"
 	admregapi "k8s.io/api/admissionregistration/v1beta1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	rest "k8s.io/client-go/rest"
diff --git a/pkg/webhookconfig/policy.go b/pkg/webhookconfig/policy.go
index f60a67290..7ccc51cc6 100644
--- a/pkg/webhookconfig/policy.go
+++ b/pkg/webhookconfig/policy.go
@@ -3,7 +3,7 @@ package webhookconfig
 import (
 	"fmt"
 
-	"github.com/nirmata/kyverno/pkg/config"
+	"github.com/kyverno/kyverno/pkg/config"
 	admregapi "k8s.io/api/admissionregistration/v1beta1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
diff --git a/pkg/webhookconfig/registration.go b/pkg/webhookconfig/registration.go
index 012837b6c..cfdb259e9 100644
--- a/pkg/webhookconfig/registration.go
+++ b/pkg/webhookconfig/registration.go
@@ -7,8 +7,8 @@ import (
 	"time"
 
 	"github.com/go-logr/logr"
-	"github.com/nirmata/kyverno/pkg/config"
-	client "github.com/nirmata/kyverno/pkg/dclient"
+	"github.com/kyverno/kyverno/pkg/config"
+	client "github.com/kyverno/kyverno/pkg/dclient"
 	admregapi "k8s.io/api/admissionregistration/v1beta1"
 	errorsapi "k8s.io/apimachinery/pkg/api/errors"
 	rest "k8s.io/client-go/rest"
diff --git a/pkg/webhookconfig/resource.go b/pkg/webhookconfig/resource.go
index f9d65fe73..389ada23e 100644
--- a/pkg/webhookconfig/resource.go
+++ b/pkg/webhookconfig/resource.go
@@ -3,7 +3,7 @@ package webhookconfig
 import (
 	"fmt"
 
-	"github.com/nirmata/kyverno/pkg/config"
+	"github.com/kyverno/kyverno/pkg/config"
 	admregapi "k8s.io/api/admissionregistration/v1beta1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
diff --git a/pkg/webhookconfig/rwebhookregister.go b/pkg/webhookconfig/rwebhookregister.go
index 63d2d964c..d8e93feb7 100644
--- a/pkg/webhookconfig/rwebhookregister.go
+++ b/pkg/webhookconfig/rwebhookregister.go
@@ -4,7 +4,7 @@ import (
 	"time"
 
 	"github.com/go-logr/logr"
-	checker "github.com/nirmata/kyverno/pkg/checker"
+	checker "github.com/kyverno/kyverno/pkg/checker"
 	"github.com/tevino/abool"
 	mconfiginformer "k8s.io/client-go/informers/admissionregistration/v1beta1"
 	mconfiglister "k8s.io/client-go/listers/admissionregistration/v1beta1"
diff --git a/pkg/webhooks/annotations.go b/pkg/webhooks/annotations.go
index acb56125c..736df7145 100644
--- a/pkg/webhooks/annotations.go
+++ b/pkg/webhooks/annotations.go
@@ -8,7 +8,7 @@ import (
 
 	jsonpatch "github.com/evanphx/json-patch"
 	"github.com/go-logr/logr"
-	"github.com/nirmata/kyverno/pkg/engine/response"
+	"github.com/kyverno/kyverno/pkg/engine/response"
 )
 
 const (
diff --git a/pkg/webhooks/common.go b/pkg/webhooks/common.go
index 9a8edb6d7..0fae1504a 100644
--- a/pkg/webhooks/common.go
+++ b/pkg/webhooks/common.go
@@ -5,10 +5,10 @@ import (
 	"strings"
 
 	"github.com/go-logr/logr"
-	kyverno "github.com/nirmata/kyverno/pkg/api/kyverno/v1"
-	"github.com/nirmata/kyverno/pkg/common"
-	"github.com/nirmata/kyverno/pkg/engine/response"
-	engineutils "github.com/nirmata/kyverno/pkg/engine/utils"
+	kyverno "github.com/kyverno/kyverno/pkg/api/kyverno/v1"
+	"github.com/kyverno/kyverno/pkg/common"
+	"github.com/kyverno/kyverno/pkg/engine/response"
+	engineutils "github.com/kyverno/kyverno/pkg/engine/utils"
 	yamlv2 "gopkg.in/yaml.v2"
 	"k8s.io/api/admission/v1beta1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
diff --git a/pkg/webhooks/generate/generate.go b/pkg/webhooks/generate/generate.go
index c2a707c26..8aef22a86 100644
--- a/pkg/webhooks/generate/generate.go
+++ b/pkg/webhooks/generate/generate.go
@@ -6,10 +6,10 @@ import (
 
 	backoff "github.com/cenkalti/backoff"
 	"github.com/go-logr/logr"
-	kyverno "github.com/nirmata/kyverno/pkg/api/kyverno/v1"
-	kyvernoclient "github.com/nirmata/kyverno/pkg/client/clientset/versioned"
-	"github.com/nirmata/kyverno/pkg/config"
-	"github.com/nirmata/kyverno/pkg/constant"
+	kyverno "github.com/kyverno/kyverno/pkg/api/kyverno/v1"
+	kyvernoclient "github.com/kyverno/kyverno/pkg/client/clientset/versioned"
+	"github.com/kyverno/kyverno/pkg/config"
+	"github.com/kyverno/kyverno/pkg/constant"
 	"k8s.io/api/admission/v1beta1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
diff --git a/pkg/webhooks/generation.go b/pkg/webhooks/generation.go
index 3ac1faad7..81a8d346e 100644
--- a/pkg/webhooks/generation.go
+++ b/pkg/webhooks/generation.go
@@ -2,22 +2,23 @@ package webhooks
 
 import (
 	"fmt"
-	kyverno "github.com/nirmata/kyverno/pkg/api/kyverno/v1"
-	v1 "github.com/nirmata/kyverno/pkg/api/kyverno/v1"
-	"github.com/nirmata/kyverno/pkg/config"
-	"github.com/nirmata/kyverno/pkg/engine"
-	"github.com/nirmata/kyverno/pkg/engine/context"
-	"github.com/nirmata/kyverno/pkg/engine/response"
-	"github.com/nirmata/kyverno/pkg/engine/utils"
-	"github.com/nirmata/kyverno/pkg/event"
-	"github.com/nirmata/kyverno/pkg/webhooks/generate"
-	v1beta1 "k8s.io/api/admission/v1beta1"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"reflect"
 	"sort"
 	"strings"
 	"time"
+
+	kyverno "github.com/kyverno/kyverno/pkg/api/kyverno/v1"
+	v1 "github.com/kyverno/kyverno/pkg/api/kyverno/v1"
+	"github.com/kyverno/kyverno/pkg/config"
+	"github.com/kyverno/kyverno/pkg/engine"
+	"github.com/kyverno/kyverno/pkg/engine/context"
+	"github.com/kyverno/kyverno/pkg/engine/response"
+	"github.com/kyverno/kyverno/pkg/engine/utils"
+	"github.com/kyverno/kyverno/pkg/event"
+	"github.com/kyverno/kyverno/pkg/webhooks/generate"
+	v1beta1 "k8s.io/api/admission/v1beta1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 )
 
 //HandleGenerate handles admission-requests for policies with generate rules
diff --git a/pkg/webhooks/mutation.go b/pkg/webhooks/mutation.go
index bacef9aac..49c972b68 100644
--- a/pkg/webhooks/mutation.go
+++ b/pkg/webhooks/mutation.go
@@ -5,13 +5,13 @@ import (
 	"sort"
 	"time"
 
-	kyverno "github.com/nirmata/kyverno/pkg/api/kyverno/v1"
-	v1 "github.com/nirmata/kyverno/pkg/api/kyverno/v1"
-	"github.com/nirmata/kyverno/pkg/engine"
-	"github.com/nirmata/kyverno/pkg/engine/context"
-	"github.com/nirmata/kyverno/pkg/engine/response"
-	engineutils "github.com/nirmata/kyverno/pkg/engine/utils"
-	"github.com/nirmata/kyverno/pkg/policyviolation"
+	kyverno "github.com/kyverno/kyverno/pkg/api/kyverno/v1"
+	v1 "github.com/kyverno/kyverno/pkg/api/kyverno/v1"
+	"github.com/kyverno/kyverno/pkg/engine"
+	"github.com/kyverno/kyverno/pkg/engine/context"
+	"github.com/kyverno/kyverno/pkg/engine/response"
+	engineutils "github.com/kyverno/kyverno/pkg/engine/utils"
+	"github.com/kyverno/kyverno/pkg/policyviolation"
 	v1beta1 "k8s.io/api/admission/v1beta1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 )
diff --git a/pkg/webhooks/policymutation.go b/pkg/webhooks/policymutation.go
index 8367e651e..94e178805 100644
--- a/pkg/webhooks/policymutation.go
+++ b/pkg/webhooks/policymutation.go
@@ -6,8 +6,8 @@ import (
 	"reflect"
 	"strings"
 
-	kyverno "github.com/nirmata/kyverno/pkg/api/kyverno/v1"
-	"github.com/nirmata/kyverno/pkg/policymutation"
+	kyverno "github.com/kyverno/kyverno/pkg/api/kyverno/v1"
+	"github.com/kyverno/kyverno/pkg/policymutation"
 	v1beta1 "k8s.io/api/admission/v1beta1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
diff --git a/pkg/webhooks/policyvalidation.go b/pkg/webhooks/policyvalidation.go
index 0e3dbcb01..80aa2cbf8 100644
--- a/pkg/webhooks/policyvalidation.go
+++ b/pkg/webhooks/policyvalidation.go
@@ -3,7 +3,7 @@ package webhooks
 import (
 	"time"
 
-	policyvalidate "github.com/nirmata/kyverno/pkg/policy"
+	policyvalidate "github.com/kyverno/kyverno/pkg/policy"
 
 	v1beta1 "k8s.io/api/admission/v1beta1"
 
diff --git a/pkg/webhooks/report.go b/pkg/webhooks/report.go
index da6520e6d..fa6e58cc1 100644
--- a/pkg/webhooks/report.go
+++ b/pkg/webhooks/report.go
@@ -4,9 +4,9 @@ import (
 	"strings"
 
 	"github.com/go-logr/logr"
-	"github.com/nirmata/kyverno/pkg/engine/response"
+	"github.com/kyverno/kyverno/pkg/engine/response"
 
-	"github.com/nirmata/kyverno/pkg/event"
+	"github.com/kyverno/kyverno/pkg/event"
 )
 
 //generateEvents generates event info for the engine responses
diff --git a/pkg/webhooks/server.go b/pkg/webhooks/server.go
index 1821f56e7..e118c1beb 100644
--- a/pkg/webhooks/server.go
+++ b/pkg/webhooks/server.go
@@ -12,34 +12,34 @@ import (
 
 	"github.com/go-logr/logr"
 	"github.com/julienschmidt/httprouter"
-	v1 "github.com/nirmata/kyverno/pkg/api/kyverno/v1"
-	"github.com/nirmata/kyverno/pkg/checker"
+	v1 "github.com/kyverno/kyverno/pkg/api/kyverno/v1"
+	"github.com/kyverno/kyverno/pkg/checker"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 
-	kyvernoclient "github.com/nirmata/kyverno/pkg/client/clientset/versioned"
-	kyvernoinformer "github.com/nirmata/kyverno/pkg/client/informers/externalversions/kyverno/v1"
-	kyvernolister "github.com/nirmata/kyverno/pkg/client/listers/kyverno/v1"
-	"github.com/nirmata/kyverno/pkg/config"
-	client "github.com/nirmata/kyverno/pkg/dclient"
-	context2 "github.com/nirmata/kyverno/pkg/engine/context"
-	enginutils "github.com/nirmata/kyverno/pkg/engine/utils"
-	"github.com/nirmata/kyverno/pkg/event"
-	"github.com/nirmata/kyverno/pkg/openapi"
-	"github.com/nirmata/kyverno/pkg/policycache"
-	"github.com/nirmata/kyverno/pkg/policystatus"
-	"github.com/nirmata/kyverno/pkg/policyviolation"
-	tlsutils "github.com/nirmata/kyverno/pkg/tls"
-	userinfo "github.com/nirmata/kyverno/pkg/userinfo"
-	"github.com/nirmata/kyverno/pkg/utils"
-	"github.com/nirmata/kyverno/pkg/webhookconfig"
-	"github.com/nirmata/kyverno/pkg/webhooks/generate"
+	kyvernoclient "github.com/kyverno/kyverno/pkg/client/clientset/versioned"
+	kyvernoinformer "github.com/kyverno/kyverno/pkg/client/informers/externalversions/kyverno/v1"
+	kyvernolister "github.com/kyverno/kyverno/pkg/client/listers/kyverno/v1"
+	"github.com/kyverno/kyverno/pkg/config"
+	client "github.com/kyverno/kyverno/pkg/dclient"
+	context2 "github.com/kyverno/kyverno/pkg/engine/context"
+	enginutils "github.com/kyverno/kyverno/pkg/engine/utils"
+	"github.com/kyverno/kyverno/pkg/event"
+	"github.com/kyverno/kyverno/pkg/openapi"
+	"github.com/kyverno/kyverno/pkg/policycache"
+	"github.com/kyverno/kyverno/pkg/policystatus"
+	"github.com/kyverno/kyverno/pkg/policyviolation"
+	tlsutils "github.com/kyverno/kyverno/pkg/tls"
+	userinfo "github.com/kyverno/kyverno/pkg/userinfo"
+	"github.com/kyverno/kyverno/pkg/utils"
+	"github.com/kyverno/kyverno/pkg/webhookconfig"
+	"github.com/kyverno/kyverno/pkg/webhooks/generate"
 	v1beta1 "k8s.io/api/admission/v1beta1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	rbacinformer "k8s.io/client-go/informers/rbac/v1"
 	rbaclister "k8s.io/client-go/listers/rbac/v1"
 	"k8s.io/client-go/tools/cache"
 
-	"github.com/nirmata/kyverno/pkg/resourcecache"
+	"github.com/kyverno/kyverno/pkg/resourcecache"
 )
 
 // WebhookServer contains configured TLS server with MutationWebhook.
diff --git a/pkg/webhooks/validate_audit.go b/pkg/webhooks/validate_audit.go
index bf4998cdd..a019c22e4 100644
--- a/pkg/webhooks/validate_audit.go
+++ b/pkg/webhooks/validate_audit.go
@@ -2,18 +2,18 @@ package webhooks
 
 import (
 	"github.com/go-logr/logr"
+	v1 "github.com/kyverno/kyverno/pkg/api/kyverno/v1"
+	kyvernoclient "github.com/kyverno/kyverno/pkg/client/clientset/versioned"
+	"github.com/kyverno/kyverno/pkg/config"
+	"github.com/kyverno/kyverno/pkg/constant"
+	enginectx "github.com/kyverno/kyverno/pkg/engine/context"
+	"github.com/kyverno/kyverno/pkg/event"
+	"github.com/kyverno/kyverno/pkg/policycache"
+	"github.com/kyverno/kyverno/pkg/policystatus"
+	"github.com/kyverno/kyverno/pkg/policyviolation"
+	"github.com/kyverno/kyverno/pkg/resourcecache"
+	"github.com/kyverno/kyverno/pkg/userinfo"
 	"github.com/minio/minio/cmd/logger"
-	v1 "github.com/nirmata/kyverno/pkg/api/kyverno/v1"
-	kyvernoclient "github.com/nirmata/kyverno/pkg/client/clientset/versioned"
-	"github.com/nirmata/kyverno/pkg/config"
-	"github.com/nirmata/kyverno/pkg/constant"
-	enginectx "github.com/nirmata/kyverno/pkg/engine/context"
-	"github.com/nirmata/kyverno/pkg/event"
-	"github.com/nirmata/kyverno/pkg/policycache"
-	"github.com/nirmata/kyverno/pkg/policystatus"
-	"github.com/nirmata/kyverno/pkg/policyviolation"
-	"github.com/nirmata/kyverno/pkg/resourcecache"
-	"github.com/nirmata/kyverno/pkg/userinfo"
 	"github.com/pkg/errors"
 	"k8s.io/api/admission/v1beta1"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
diff --git a/pkg/webhooks/validation.go b/pkg/webhooks/validation.go
index 7eccbc5b2..1d37ef797 100644
--- a/pkg/webhooks/validation.go
+++ b/pkg/webhooks/validation.go
@@ -1,27 +1,28 @@
 package webhooks
 
 import (
-	"github.com/nirmata/kyverno/pkg/config"
 	"reflect"
 	"sort"
 	"time"
 
+	"github.com/kyverno/kyverno/pkg/config"
+
 	"github.com/go-logr/logr"
-	"github.com/nirmata/kyverno/pkg/event"
-	"github.com/nirmata/kyverno/pkg/policystatus"
-	"github.com/nirmata/kyverno/pkg/utils"
-
-	kyverno "github.com/nirmata/kyverno/pkg/api/kyverno/v1"
-	v1 "github.com/nirmata/kyverno/pkg/api/kyverno/v1"
-	"github.com/nirmata/kyverno/pkg/engine"
-	"github.com/nirmata/kyverno/pkg/engine/context"
-	"github.com/nirmata/kyverno/pkg/engine/response"
-	"github.com/nirmata/kyverno/pkg/policyviolation"
+	"github.com/kyverno/kyverno/pkg/event"
+	"github.com/kyverno/kyverno/pkg/policystatus"
+	"github.com/kyverno/kyverno/pkg/utils"
+
+	kyverno "github.com/kyverno/kyverno/pkg/api/kyverno/v1"
+	v1 "github.com/kyverno/kyverno/pkg/api/kyverno/v1"
+	"github.com/kyverno/kyverno/pkg/engine"
+	"github.com/kyverno/kyverno/pkg/engine/context"
+	"github.com/kyverno/kyverno/pkg/engine/response"
+	"github.com/kyverno/kyverno/pkg/policyviolation"
 	v1beta1 "k8s.io/api/admission/v1beta1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 
-	"github.com/nirmata/kyverno/pkg/resourcecache"
+	"github.com/kyverno/kyverno/pkg/resourcecache"
 )
 
 // HandleValidation handles validating webhook admission request
diff --git a/samples/README.md b/samples/README.md
index 166b6a04f..c6e4606c3 100644
--- a/samples/README.md
+++ b/samples/README.md
@@ -43,7 +43,7 @@ To apply these policies to your cluster, install Kyverno and import the policies
 **Install Kyverno**
 
 ````sh
-kubectl create -f https://github.com/nirmata/kyverno/raw/master/definitions/install.yaml
+kubectl create -f https://github.com/kyverno/kyverno/raw/master/definitions/install.yaml
 ````
 <small>[(installation docs)](../documentation/installation.md)</small>
 
diff --git a/scripts/install-cli.sh b/scripts/install-cli.sh
index dbe33b1f8..d27b06737 100755
--- a/scripts/install-cli.sh
+++ b/scripts/install-cli.sh
@@ -13,7 +13,7 @@ Usage: $this [-b bindir] [-d] [tag]
   -b sets bindir or installation directory, Defaults to ./bin
   -d turns on debug logging
   [tag] is a tag from
-  https://github.com/nirmata/kyverno/releases
+  https://github.com/kyverno/kyverno/releases
   If tag is missing, then the latest release will be used.
 
 Generated by godownloader
diff --git a/scripts/update-codegen.sh b/scripts/update-codegen.sh
index a6f56b314..e35e8a993 100755
--- a/scripts/update-codegen.sh
+++ b/scripts/update-codegen.sh
@@ -13,7 +13,7 @@ esac
 NIRMATA_DIR=$(dirname ${BASH_SOURCE})/..
 NIRMATA_ROOT=$(${linkutil} -f ${NIRMATA_DIR})
 
-# instructions to build project https://github.com/nirmata/kyverno/wiki/Building
+# instructions to build project https://github.com/kyverno/kyverno/wiki/Building
 
 # get relative path to code generation script
 CODEGEN_PKG="${GOPATH}/src/k8s.io/code-generator"


Test patch:
diff --git a/pkg/auth/auth_test.go b/pkg/auth/auth_test.go
index 6dbc80028..89c6ba854 100644
--- a/pkg/auth/auth_test.go
+++ b/pkg/auth/auth_test.go
@@ -5,9 +5,9 @@ package auth
 // 	"time"
 
 // 	"github.com/golang/glog"
-// 	"github.com/nirmata/kyverno/pkg/config"
-// 	dclient "github.com/nirmata/kyverno/pkg/dclient"
-// 	"github.com/nirmata/kyverno/pkg/signal"
+// 	"github.com/kyverno/kyverno/pkg/config"
+// 	dclient "github.com/kyverno/kyverno/pkg/dclient"
+// 	"github.com/kyverno/kyverno/pkg/signal"
 // )
 
 // func Test_Auth_pass(t *testing.T) {
diff --git a/pkg/dclient/client_test.go b/pkg/dclient/client_test.go
index b9f25902d..4294117c6 100644
--- a/pkg/dclient/client_test.go
+++ b/pkg/dclient/client_test.go
@@ -3,7 +3,7 @@ package client
 import (
 	"testing"
 
-	"github.com/nirmata/kyverno/pkg/config"
+	"github.com/kyverno/kyverno/pkg/config"
 	meta "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
diff --git a/pkg/engine/context/context_test.go b/pkg/engine/context/context_test.go
index a583fdbef..6997aa5c0 100644
--- a/pkg/engine/context/context_test.go
+++ b/pkg/engine/context/context_test.go
@@ -4,7 +4,7 @@ import (
 	"reflect"
 	"testing"
 
-	kyverno "github.com/nirmata/kyverno/pkg/api/kyverno/v1"
+	kyverno "github.com/kyverno/kyverno/pkg/api/kyverno/v1"
 	authenticationv1 "k8s.io/api/authentication/v1"
 )
 
diff --git a/pkg/engine/mutate/overlay_test.go b/pkg/engine/mutate/overlay_test.go
index a7c889003..45f501b17 100644
--- a/pkg/engine/mutate/overlay_test.go
+++ b/pkg/engine/mutate/overlay_test.go
@@ -6,7 +6,7 @@ import (
 	"testing"
 
 	jsonpatch "github.com/evanphx/json-patch"
-	"github.com/nirmata/kyverno/pkg/engine/utils"
+	"github.com/kyverno/kyverno/pkg/engine/utils"
 	"gotest.tools/assert"
 	"sigs.k8s.io/controller-runtime/pkg/log"
 )
diff --git a/pkg/engine/mutate/patchJson6902_test.go b/pkg/engine/mutate/patchJson6902_test.go
index baa8ff83e..6ff091d32 100644
--- a/pkg/engine/mutate/patchJson6902_test.go
+++ b/pkg/engine/mutate/patchJson6902_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/ghodss/yaml"
-	kyverno "github.com/nirmata/kyverno/pkg/api/kyverno/v1"
+	kyverno "github.com/kyverno/kyverno/pkg/api/kyverno/v1"
 	assert "github.com/stretchr/testify/assert"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"sigs.k8s.io/controller-runtime/pkg/log"
diff --git a/pkg/engine/mutate/patchesUtils_test.go b/pkg/engine/mutate/patchesUtils_test.go
index 484700edf..8f20aa50c 100644
--- a/pkg/engine/mutate/patchesUtils_test.go
+++ b/pkg/engine/mutate/patchesUtils_test.go
@@ -4,8 +4,8 @@ import (
 	"encoding/json"
 	"testing"
 
-	v1 "github.com/nirmata/kyverno/pkg/api/kyverno/v1"
-	"github.com/nirmata/kyverno/pkg/engine/utils"
+	v1 "github.com/kyverno/kyverno/pkg/api/kyverno/v1"
+	"github.com/kyverno/kyverno/pkg/engine/utils"
 	assertnew "github.com/stretchr/testify/assert"
 	"gotest.tools/assert"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
diff --git a/pkg/engine/mutate/patches_test.go b/pkg/engine/mutate/patches_test.go
index a2eb5f71e..9107ae62c 100644
--- a/pkg/engine/mutate/patches_test.go
+++ b/pkg/engine/mutate/patches_test.go
@@ -7,8 +7,8 @@ import (
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"sigs.k8s.io/controller-runtime/pkg/log"
 
-	types "github.com/nirmata/kyverno/pkg/api/kyverno/v1"
-	"github.com/nirmata/kyverno/pkg/engine/utils"
+	types "github.com/kyverno/kyverno/pkg/api/kyverno/v1"
+	"github.com/kyverno/kyverno/pkg/engine/utils"
 )
 
 const endpointsDocument string = `{
diff --git a/pkg/engine/mutate/strategicMergePatch_test.go b/pkg/engine/mutate/strategicMergePatch_test.go
index b18f84ee3..4eea6ef3f 100644
--- a/pkg/engine/mutate/strategicMergePatch_test.go
+++ b/pkg/engine/mutate/strategicMergePatch_test.go
@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"testing"
 
-	kyvernov1 "github.com/nirmata/kyverno/pkg/api/kyverno/v1"
+	kyvernov1 "github.com/kyverno/kyverno/pkg/api/kyverno/v1"
 	assertnew "github.com/stretchr/testify/assert"
 	"gotest.tools/assert"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
diff --git a/pkg/engine/mutation_test.go b/pkg/engine/mutation_test.go
index 645e19e32..5c5d90b66 100644
--- a/pkg/engine/mutation_test.go
+++ b/pkg/engine/mutation_test.go
@@ -5,9 +5,9 @@ import (
 	"reflect"
 	"testing"
 
-	kyverno "github.com/nirmata/kyverno/pkg/api/kyverno/v1"
-	"github.com/nirmata/kyverno/pkg/engine/context"
-	"github.com/nirmata/kyverno/pkg/engine/utils"
+	kyverno "github.com/kyverno/kyverno/pkg/api/kyverno/v1"
+	"github.com/kyverno/kyverno/pkg/engine/context"
+	"github.com/kyverno/kyverno/pkg/engine/utils"
 	"gotest.tools/assert"
 )
 
diff --git a/pkg/engine/utils_test.go b/pkg/engine/utils_test.go
index ed924365e..935f49f41 100644
--- a/pkg/engine/utils_test.go
+++ b/pkg/engine/utils_test.go
@@ -4,8 +4,8 @@ import (
 	"encoding/json"
 	"testing"
 
-	kyverno "github.com/nirmata/kyverno/pkg/api/kyverno/v1"
-	"github.com/nirmata/kyverno/pkg/engine/utils"
+	kyverno "github.com/kyverno/kyverno/pkg/api/kyverno/v1"
+	"github.com/kyverno/kyverno/pkg/engine/utils"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
diff --git a/pkg/engine/validate/pattern_test.go b/pkg/engine/validate/pattern_test.go
index 8d8d437d2..390c74d50 100644
--- a/pkg/engine/validate/pattern_test.go
+++ b/pkg/engine/validate/pattern_test.go
@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"testing"
 
-	"github.com/nirmata/kyverno/pkg/engine/operator"
+	"github.com/kyverno/kyverno/pkg/engine/operator"
 	"gotest.tools/assert"
 	"sigs.k8s.io/controller-runtime/pkg/log"
 )
diff --git a/pkg/engine/validate/validate_test.go b/pkg/engine/validate/validate_test.go
index f44692bfb..b70e92f15 100644
--- a/pkg/engine/validate/validate_test.go
+++ b/pkg/engine/validate/validate_test.go
@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"testing"
 
-	"github.com/nirmata/kyverno/pkg/engine/common"
+	"github.com/kyverno/kyverno/pkg/engine/common"
 	"gotest.tools/assert"
 	"sigs.k8s.io/controller-runtime/pkg/log"
 )
diff --git a/pkg/engine/validation_test.go b/pkg/engine/validation_test.go
index df0cd4f1e..946b35f36 100644
--- a/pkg/engine/validation_test.go
+++ b/pkg/engine/validation_test.go
@@ -6,10 +6,10 @@ import (
 
 	"k8s.io/api/admission/v1beta1"
 
-	kyverno "github.com/nirmata/kyverno/pkg/api/kyverno/v1"
-	"github.com/nirmata/kyverno/pkg/engine/context"
-	"github.com/nirmata/kyverno/pkg/engine/utils"
-	utils2 "github.com/nirmata/kyverno/pkg/utils"
+	kyverno "github.com/kyverno/kyverno/pkg/api/kyverno/v1"
+	"github.com/kyverno/kyverno/pkg/engine/context"
+	"github.com/kyverno/kyverno/pkg/engine/utils"
+	utils2 "github.com/kyverno/kyverno/pkg/utils"
 	"gotest.tools/assert"
 )
 
diff --git a/pkg/engine/variables/evaluate_test.go b/pkg/engine/variables/evaluate_test.go
index d7d409b8f..48342e5d9 100644
--- a/pkg/engine/variables/evaluate_test.go
+++ b/pkg/engine/variables/evaluate_test.go
@@ -4,8 +4,8 @@ import (
 	"encoding/json"
 	"testing"
 
-	kyverno "github.com/nirmata/kyverno/pkg/api/kyverno/v1"
-	"github.com/nirmata/kyverno/pkg/engine/context"
+	kyverno "github.com/kyverno/kyverno/pkg/api/kyverno/v1"
+	"github.com/kyverno/kyverno/pkg/engine/context"
 	"sigs.k8s.io/controller-runtime/pkg/log"
 )
 
diff --git a/pkg/engine/variables/variables_test.go b/pkg/engine/variables/variables_test.go
index bb88cc13a..8b300b90f 100644
--- a/pkg/engine/variables/variables_test.go
+++ b/pkg/engine/variables/variables_test.go
@@ -5,11 +5,11 @@ import (
 	"reflect"
 	"testing"
 
-	kyverno "github.com/nirmata/kyverno/pkg/api/kyverno/v1"
+	kyverno "github.com/kyverno/kyverno/pkg/api/kyverno/v1"
 	authenticationv1 "k8s.io/api/authentication/v1"
 	"sigs.k8s.io/controller-runtime/pkg/log"
 
-	"github.com/nirmata/kyverno/pkg/engine/context"
+	"github.com/kyverno/kyverno/pkg/engine/context"
 )
 
 func Test_variablesub1(t *testing.T) {
diff --git a/pkg/engine/variables/vars_test.go b/pkg/engine/variables/vars_test.go
index 0e25e269e..06fb6470f 100644
--- a/pkg/engine/variables/vars_test.go
+++ b/pkg/engine/variables/vars_test.go
@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"testing"
 
-	"github.com/nirmata/kyverno/pkg/engine/context"
+	"github.com/kyverno/kyverno/pkg/engine/context"
 	"gotest.tools/assert"
 	"sigs.k8s.io/controller-runtime/pkg/log"
 )
diff --git a/pkg/generate/policyStatus_test.go b/pkg/generate/policyStatus_test.go
index b465a8547..cbdc8b2c6 100644
--- a/pkg/generate/policyStatus_test.go
+++ b/pkg/generate/policyStatus_test.go
@@ -6,7 +6,7 @@ import (
 	"testing"
 	"time"
 
-	v1 "github.com/nirmata/kyverno/pkg/api/kyverno/v1"
+	v1 "github.com/kyverno/kyverno/pkg/api/kyverno/v1"
 )
 
 func Test_Stats(t *testing.T) {
diff --git a/pkg/openapi/validation_test.go b/pkg/openapi/validation_test.go
index 2e86215df..cabd6ee3d 100644
--- a/pkg/openapi/validation_test.go
+++ b/pkg/openapi/validation_test.go
@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"testing"
 
-	v1 "github.com/nirmata/kyverno/pkg/api/kyverno/v1"
+	v1 "github.com/kyverno/kyverno/pkg/api/kyverno/v1"
 )
 
 func Test_ValidateMutationPolicy(t *testing.T) {
diff --git a/pkg/policy/generate/validate_test.go b/pkg/policy/generate/validate_test.go
index 631aac6ed..8a35ddca3 100644
--- a/pkg/policy/generate/validate_test.go
+++ b/pkg/policy/generate/validate_test.go
@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"testing"
 
-	kyverno "github.com/nirmata/kyverno/pkg/api/kyverno/v1"
+	kyverno "github.com/kyverno/kyverno/pkg/api/kyverno/v1"
 	"gotest.tools/assert"
 )
 
diff --git a/pkg/policy/mutate/validate_test.go b/pkg/policy/mutate/validate_test.go
index 84ff0e59b..b0948eb34 100644
--- a/pkg/policy/mutate/validate_test.go
+++ b/pkg/policy/mutate/validate_test.go
@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"testing"
 
-	kyverno "github.com/nirmata/kyverno/pkg/api/kyverno/v1"
+	kyverno "github.com/kyverno/kyverno/pkg/api/kyverno/v1"
 	"gotest.tools/assert"
 )
 
diff --git a/pkg/policy/validate/validate_test.go b/pkg/policy/validate/validate_test.go
index ee8320470..17ce74590 100644
--- a/pkg/policy/validate/validate_test.go
+++ b/pkg/policy/validate/validate_test.go
@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"testing"
 
-	kyverno "github.com/nirmata/kyverno/pkg/api/kyverno/v1"
+	kyverno "github.com/kyverno/kyverno/pkg/api/kyverno/v1"
 	"gotest.tools/assert"
 )
 
diff --git a/pkg/policy/validate_test.go b/pkg/policy/validate_test.go
index 9855f2130..c05b9f42d 100644
--- a/pkg/policy/validate_test.go
+++ b/pkg/policy/validate_test.go
@@ -4,9 +4,9 @@ import (
 	"encoding/json"
 	"testing"
 
-	"github.com/nirmata/kyverno/pkg/openapi"
+	"github.com/kyverno/kyverno/pkg/openapi"
 
-	kyverno "github.com/nirmata/kyverno/pkg/api/kyverno/v1"
+	kyverno "github.com/kyverno/kyverno/pkg/api/kyverno/v1"
 	"gotest.tools/assert"
 )
 
diff --git a/pkg/policycache/cache_test.go b/pkg/policycache/cache_test.go
index 4c952291c..50d7a5985 100644
--- a/pkg/policycache/cache_test.go
+++ b/pkg/policycache/cache_test.go
@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"testing"
 
-	kyverno "github.com/nirmata/kyverno/pkg/api/kyverno/v1"
+	kyverno "github.com/kyverno/kyverno/pkg/api/kyverno/v1"
 	"gotest.tools/assert"
 	"sigs.k8s.io/controller-runtime/pkg/log"
 )
diff --git a/pkg/policymutation/policymutation_test.go b/pkg/policymutation/policymutation_test.go
index 49895f585..37536dee1 100644
--- a/pkg/policymutation/policymutation_test.go
+++ b/pkg/policymutation/policymutation_test.go
@@ -7,8 +7,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/nirmata/kyverno/pkg/engine"
-	"github.com/nirmata/kyverno/pkg/utils"
+	"github.com/kyverno/kyverno/pkg/engine"
+	"github.com/kyverno/kyverno/pkg/utils"
 	"gotest.tools/assert"
 	"sigs.k8s.io/controller-runtime/pkg/log"
 )
diff --git a/pkg/policystatus/status_test.go b/pkg/policystatus/status_test.go
index 595f87f59..bdf176026 100644
--- a/pkg/policystatus/status_test.go
+++ b/pkg/policystatus/status_test.go
@@ -3,12 +3,13 @@ package policystatus
 import (
 	"encoding/json"
 	"fmt"
-	"k8s.io/apimachinery/pkg/labels"
 	"testing"
 	"time"
 
-	v1 "github.com/nirmata/kyverno/pkg/api/kyverno/v1"
-	lv1 "github.com/nirmata/kyverno/pkg/client/listers/kyverno/v1"
+	"k8s.io/apimachinery/pkg/labels"
+
+	v1 "github.com/kyverno/kyverno/pkg/api/kyverno/v1"
+	lv1 "github.com/kyverno/kyverno/pkg/client/listers/kyverno/v1"
 )
 
 type dummyStore struct {
diff --git a/pkg/policyviolation/builder_test.go b/pkg/policyviolation/builder_test.go
index a44314f9f..4a7bc056a 100644
--- a/pkg/policyviolation/builder_test.go
+++ b/pkg/policyviolation/builder_test.go
@@ -3,7 +3,7 @@ package policyviolation
 import (
 	"testing"
 
-	"github.com/nirmata/kyverno/pkg/engine/response"
+	"github.com/kyverno/kyverno/pkg/engine/response"
 	"gotest.tools/assert"
 	"sigs.k8s.io/controller-runtime/pkg/log"
 )
diff --git a/pkg/policyviolation/policyStatus_test.go b/pkg/policyviolation/policyStatus_test.go
index 39f718ba1..e0777bc46 100644
--- a/pkg/policyviolation/policyStatus_test.go
+++ b/pkg/policyviolation/policyStatus_test.go
@@ -5,7 +5,7 @@ import (
 	"reflect"
 	"testing"
 
-	v1 "github.com/nirmata/kyverno/pkg/api/kyverno/v1"
+	v1 "github.com/kyverno/kyverno/pkg/api/kyverno/v1"
 )
 
 func Test_Stats(t *testing.T) {
diff --git a/pkg/testrunner/scenario.go b/pkg/testrunner/scenario.go
index a2c13b6b8..0272d0d85 100644
--- a/pkg/testrunner/scenario.go
+++ b/pkg/testrunner/scenario.go
@@ -9,10 +9,10 @@ import (
 	"reflect"
 	"testing"
 
-	kyverno "github.com/nirmata/kyverno/pkg/api/kyverno/v1"
-	client "github.com/nirmata/kyverno/pkg/dclient"
-	"github.com/nirmata/kyverno/pkg/engine"
-	"github.com/nirmata/kyverno/pkg/engine/response"
+	kyverno "github.com/kyverno/kyverno/pkg/api/kyverno/v1"
+	client "github.com/kyverno/kyverno/pkg/dclient"
+	"github.com/kyverno/kyverno/pkg/engine"
+	"github.com/kyverno/kyverno/pkg/engine/response"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
diff --git a/pkg/webhooks/annotations_test.go b/pkg/webhooks/annotations_test.go
index d14657b6c..da80adb5d 100644
--- a/pkg/webhooks/annotations_test.go
+++ b/pkg/webhooks/annotations_test.go
@@ -3,7 +3,7 @@ package webhooks
 import (
 	"testing"
 
-	"github.com/nirmata/kyverno/pkg/engine/response"
+	"github.com/kyverno/kyverno/pkg/engine/response"
 	"gotest.tools/assert"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"sigs.k8s.io/controller-runtime/pkg/log"
diff --git a/pkg/webhooks/policyStatus_test.go b/pkg/webhooks/policyStatus_test.go
index 6c71fc622..2b80850d7 100644
--- a/pkg/webhooks/policyStatus_test.go
+++ b/pkg/webhooks/policyStatus_test.go
@@ -6,8 +6,8 @@ import (
 	"testing"
 	"time"
 
-	v1 "github.com/nirmata/kyverno/pkg/api/kyverno/v1"
-	"github.com/nirmata/kyverno/pkg/engine/response"
+	v1 "github.com/kyverno/kyverno/pkg/api/kyverno/v1"
+	"github.com/kyverno/kyverno/pkg/engine/response"
 )
 
 func Test_GenerateStats(t *testing.T) {
diff --git a/pkg/webhooks/policymutation_test.go b/pkg/webhooks/policymutation_test.go
index 6a3334005..b8dd09992 100644
--- a/pkg/webhooks/policymutation_test.go
+++ b/pkg/webhooks/policymutation_test.go
@@ -4,9 +4,9 @@ import (
 	"encoding/json"
 	"testing"
 
-	kyverno "github.com/nirmata/kyverno/pkg/api/kyverno/v1"
-	"github.com/nirmata/kyverno/pkg/engine/utils"
-	"github.com/nirmata/kyverno/pkg/policymutation"
+	kyverno "github.com/kyverno/kyverno/pkg/api/kyverno/v1"
+	"github.com/kyverno/kyverno/pkg/engine/utils"
+	"github.com/kyverno/kyverno/pkg/policymutation"
 
 	assertnew "github.com/stretchr/testify/assert"
 	"gotest.tools/assert"