diff --git a/debian/buster/debian/changelog b/debian/buster/debian/changelog
new file mode 100644
index 0000000..64d3385
--- /dev/null
+++ b/debian/buster/debian/changelog
@@ -0,0 +1,6 @@
+ignition-cmake3 (2.999.999-1~buster) buster; urgency=medium
+
+  * Stub to be removed after first entry
+
+ -- Louise Poubel <louise@openrobotics.org>  Wed, 06 Apr 2022 17:27:45 -0700
+
diff --git a/debian/buster/debian/compat b/debian/buster/debian/compat
new file mode 120000
index 0000000..ad30260
--- /dev/null
+++ b/debian/buster/debian/compat
@@ -0,0 +1 @@
+../../../ubuntu/debian/compat
\ No newline at end of file
diff --git a/debian/buster/debian/control b/debian/buster/debian/control
new file mode 120000
index 0000000..4f862d3
--- /dev/null
+++ b/debian/buster/debian/control
@@ -0,0 +1 @@
+../../../ubuntu/debian/control
\ No newline at end of file
diff --git a/debian/buster/debian/copyright b/debian/buster/debian/copyright
new file mode 120000
index 0000000..61b9831
--- /dev/null
+++ b/debian/buster/debian/copyright
@@ -0,0 +1 @@
+../../../ubuntu/debian/copyright
\ No newline at end of file
diff --git a/debian/buster/debian/rules b/debian/buster/debian/rules
new file mode 120000
index 0000000..1ab459a
--- /dev/null
+++ b/debian/buster/debian/rules
@@ -0,0 +1 @@
+../../../ubuntu/debian/rules
\ No newline at end of file
diff --git a/debian/buster/debian/source b/debian/buster/debian/source
new file mode 120000
index 0000000..7a61075
--- /dev/null
+++ b/debian/buster/debian/source
@@ -0,0 +1 @@
+../../../ubuntu/debian/source
\ No newline at end of file
diff --git a/debian/sid/debian/changelog b/debian/sid/debian/changelog
new file mode 100644
index 0000000..aaedd56
--- /dev/null
+++ b/debian/sid/debian/changelog
@@ -0,0 +1,6 @@
+ignition-cmake3 (2.999.999-1~sid) sid; urgency=medium
+
+  * Stub to be removed after first entry
+
+ -- Louise Poubel <louise@openrobotics.org>  Wed, 06 Apr 2022 17:27:45 -0700
+
diff --git a/debian/sid/debian/compat b/debian/sid/debian/compat
new file mode 120000
index 0000000..ad30260
--- /dev/null
+++ b/debian/sid/debian/compat
@@ -0,0 +1 @@
+../../../ubuntu/debian/compat
\ No newline at end of file
diff --git a/debian/sid/debian/control b/debian/sid/debian/control
new file mode 120000
index 0000000..4f862d3
--- /dev/null
+++ b/debian/sid/debian/control
@@ -0,0 +1 @@
+../../../ubuntu/debian/control
\ No newline at end of file
diff --git a/debian/sid/debian/copyright b/debian/sid/debian/copyright
new file mode 120000
index 0000000..61b9831
--- /dev/null
+++ b/debian/sid/debian/copyright
@@ -0,0 +1 @@
+../../../ubuntu/debian/copyright
\ No newline at end of file
diff --git a/debian/sid/debian/rules b/debian/sid/debian/rules
new file mode 120000
index 0000000..1ab459a
--- /dev/null
+++ b/debian/sid/debian/rules
@@ -0,0 +1 @@
+../../../ubuntu/debian/rules
\ No newline at end of file
diff --git a/debian/sid/debian/source b/debian/sid/debian/source
new file mode 120000
index 0000000..7a61075
--- /dev/null
+++ b/debian/sid/debian/source
@@ -0,0 +1 @@
+../../../ubuntu/debian/source
\ No newline at end of file
diff --git a/focal/debian/changelog b/focal/debian/changelog
index 6ead401..875875a 100644
--- a/focal/debian/changelog
+++ b/focal/debian/changelog
@@ -1,9 +1,3 @@
-gz-cmake3 (2.999.999-2~focal) focal; urgency=medium
-
-  * Change package source name
-
- -- Jose Luis Rivero <jrivero@osrfoundation.org>  Mon, 16 May 2022 16:58:02 +0200
-
 ignition-cmake3 (2.999.999-1~focal) focal; urgency=medium
 
   * Stub to be removed after first entry
diff --git a/focal/debian/libgz-cmake3-dev.install b/focal/debian/libgz-cmake3-dev.install
deleted file mode 120000
index 010f017..0000000
--- a/focal/debian/libgz-cmake3-dev.install
+++ /dev/null
@@ -1 +0,0 @@
-../../ubuntu/debian/libgz-cmake-dev.install
\ No newline at end of file
diff --git a/jammy/debian/changelog b/jammy/debian/changelog
index 8bb507d..0ff53de 100644
--- a/jammy/debian/changelog
+++ b/jammy/debian/changelog
@@ -1,9 +1,3 @@
-gz-cmake3 (2.999.999-2~bionic) bionic; urgency=medium
-
-  * Change package source name
-
- -- Jose Luis Rivero <jrivero@osrfoundation.org>  Mon, 16 May 2022 16:58:01 +0200
-
 ignition-cmake3 (2.999.999-1~jammy) bionic; urgency=medium
 
   * Stub to be removed after first entry
diff --git a/jammy/debian/control b/jammy/debian/control
index d2002eb..95945c4 100644
--- a/jammy/debian/control
+++ b/jammy/debian/control
@@ -1,34 +1,26 @@
-Source: gz-cmake3
+Source: ignition-cmake3
 Maintainer: Jose Luis Rivero <jrivero@osrfoundation.org>
 Section: science
 Priority: optional
 Build-Depends: cmake,
                pkg-config,
                debhelper (>= 11)
-Vcs-Browser: https://github.com/gazebosim/gz-cmake
-Vcs-Git: https://github.com/gazebosim/gz-cmake.git
+Vcs-Browser: https://github.com/ignitionrobotics/ign-cmake
+Vcs-Git: https://github.com/ignitionrobotics/ign-cmake.git
 Standards-Version: 4.5.1
-Homepage: http://gazebosim.org/
+Homepage: http://ignitionrobotics.org/
 
-Package: libgz-cmake3-dev
+Package: libignition-cmake3-dev
 Architecture: any
 Section: libdevel
 Depends: cmake, ${misc:Depends}
 Breaks: libignition-cmake-dev (<= 2.10.0-2)
 Replaces: libignition-cmake-dev (<= 2.10.0-2)
 Multi-Arch: same
-Description: Gazebo Robotics CMake Library - Development files
- CMake modules to be used by the Gazebo projects.
+Description: Ignition Robotics CMake Library - Development files
+ CMake modules to be used by the Ignition projects.
  .
- This package is required to build gz projects, as well as to link your
+ This package is required to build ignition projects, as well as to link your
  third party projects against them. It provides modules that are used to find
- dependencies of gz projects and generate cmake targets for consumers of
- gz projects to link against.
-
-Package: libignition-cmake3-dev
-Depends: libgz-cmake3-dev, ${misc:Depends}
-Architecture: all
-Priority: optional
-Section: oldlibs
-Description: transitional package
- This is a transitional package. It can safely be removed.
+ dependencies of ignition projects and generate cmake targets for consumers of
+ ignition projects to link against.
diff --git a/jammy/debian/libgz-cmake3-dev.examples b/jammy/debian/libgz-cmake3-dev.examples
deleted file mode 120000
index 22c8710..0000000
--- a/jammy/debian/libgz-cmake3-dev.examples
+++ /dev/null
@@ -1 +0,0 @@
-../../ubuntu/debian/libgz-cmake-dev.examples
\ No newline at end of file
diff --git a/jammy/debian/libgz-cmake3-dev.install b/jammy/debian/libgz-cmake3-dev.install
deleted file mode 120000
index 010f017..0000000
--- a/jammy/debian/libgz-cmake3-dev.install
+++ /dev/null
@@ -1 +0,0 @@
-../../ubuntu/debian/libgz-cmake-dev.install
\ No newline at end of file
diff --git a/jammy/debian/libignition-cmake3-dev.examples b/jammy/debian/libignition-cmake3-dev.examples
new file mode 120000
index 0000000..0a51dfc
--- /dev/null
+++ b/jammy/debian/libignition-cmake3-dev.examples
@@ -0,0 +1 @@
+../../ubuntu/debian/libignition-cmake-dev.examples
\ No newline at end of file
diff --git a/ubuntu/debian/control b/ubuntu/debian/control
index e995df9..938522c 100644
--- a/ubuntu/debian/control
+++ b/ubuntu/debian/control
@@ -1,32 +1,24 @@
-Source: gz-cmake3
+Source: ignition-cmake3
 Maintainer: Jose Luis Rivero <jrivero@osrfoundation.org>
 Section: science
 Priority: optional
 Build-Depends: cmake,
                pkg-config,
                debhelper (>= 11)
-Vcs-Browser: https://github.com/gazebosim/gz-cmake
-Vcs-Git: https://github.com/gazebosim/gz-cmake.git
+Vcs-Browser: https://github.com/ignitionrobotics/ign-cmake
+Vcs-Git: https://github.com/ignitionrobotics/ign-cmake.git
 Standards-Version: 4.5.1
-Homepage: http://gazebosim.org/
+Homepage: http://ignitionrobotics.org/
 
-Package: libgz-cmake3-dev
+Package: libignition-cmake3-dev
 Architecture: any
 Section: libdevel
 Depends: cmake, ${misc:Depends}
 Multi-Arch: same
-Description: Gazebo Robotics CMake Library - Development files
- CMake modules to be used by the Gazebo projects.
+Description: Ignition Robotics CMake Library - Development files
+ CMake modules to be used by the Ignition projects.
  .
- This package is required to build gz projects, as well as to link your
+ This package is required to build ignition projects, as well as to link your
  third party projects against them. It provides modules that are used to find
- dependencies of gz projects and generate cmake targets for consumers of
- gz projects to link against.
-
-Package: libignition-cmake3-dev
-Depends: libgz-cmake3-dev, ${misc:Depends}
-Architecture: all
-Priority: optional
-Section: oldlibs
-Description: transitional package
- This is a transitional package. It can safely be removed.
+ dependencies of ignition projects and generate cmake targets for consumers of
+ ignition projects to link against.
diff --git a/ubuntu/debian/copyright b/ubuntu/debian/copyright
index dc86bba..dd8dc6f 100644
--- a/ubuntu/debian/copyright
+++ b/ubuntu/debian/copyright
@@ -1,7 +1,7 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: gz_cmake
+Upstream-Name: ignition_cmake
 Upstream-Contact: gazebo-list@gazebosim.org
-Source: https://github.org/gazebosim/gz_cmake
+Source: https://bitbucket.org/osrf/ignition_cmake
 
 Files: *
 Copyright: 2013 Open Source Robotics Foundation
diff --git a/ubuntu/debian/debian_copyright_2022 b/ubuntu/debian/debian_copyright_2022
index 507884a..5b894f8 100644
--- a/ubuntu/debian/debian_copyright_2022
+++ b/ubuntu/debian/debian_copyright_2022
@@ -1,7 +1,7 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: gz-cmake
+Upstream-Name: ignition-cmake
 Upstream-Contact: gazebo-list@gazebosim.org
-Source: https://github.org/gazebosim/gz-cmake
+Source: https://bitbucket.org/ignitionrobotics/ign_cmake
 
 Files: *
 Copyright: 2017-2020, Open Source Robotics Foundation
diff --git a/ubuntu/debian/libgz-cmake-dev.install b/ubuntu/debian/libgz-cmake-dev.install
deleted file mode 100644
index 097923b..0000000
--- a/ubuntu/debian/libgz-cmake-dev.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/*
diff --git a/ubuntu/debian/libgz-cmake-dev.examples b/ubuntu/debian/libignition-cmake-dev.examples
similarity index 100%
rename from ubuntu/debian/libgz-cmake-dev.examples
rename to ubuntu/debian/libignition-cmake-dev.examples
diff --git a/ubuntu/debian/watch b/ubuntu/debian/watch
index 3d09552..f782a3f 100644
--- a/ubuntu/debian/watch
+++ b/ubuntu/debian/watch
@@ -1,4 +1,4 @@
 version=4
 opts="filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%@PACKAGE@-$1.tar.gz%" \
-    https://github.com/gazebosim/ign-cmake/tags \
+    https://github.com/ignitionrobotics/ign-cmake/tags \
 		(?:.*?/)@PACKAGE@.*_(\d[\d.]*)\.tar\.gz