diff --git a/jjb/opendev/openstack-os-resource-classes/openstack-os-resource-classes-push-upstream-jobs.yml b/jjb/opendev/openstack-os-resource-classes/openstack-os-resource-classes-push-upstream-jobs.yml
new file mode 100644
index 0000000..2fa20d2
--- /dev/null
+++ b/jjb/opendev/openstack-os-resource-classes/openstack-os-resource-classes-push-upstream-jobs.yml
@@ -0,0 +1,26 @@
+---
+# ============LICENSE_START=======================================================
+#  Copyright (C) 2019 Nordix Foundation.
+# ================================================================================
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# SPDX-License-Identifier: Apache-2.0
+# ============LICENSE_END=========================================================
+#
+- project:
+    name: openstack-os-resource-classes-push-upstream
+    project: openstack/os-resource-classes
+    project-name: openstack-os-resource-classes
+
+    jobs:
+      - 'opendev-{project-name}-push-upstream'
\ No newline at end of file
diff --git a/jjb/opendev/openstack-os-resource-classes/openstack-os-resource-classes-rebase-jobs.yml b/jjb/opendev/openstack-os-resource-classes/openstack-os-resource-classes-rebase-jobs.yml
new file mode 100644
index 0000000..41fc9c9
--- /dev/null
+++ b/jjb/opendev/openstack-os-resource-classes/openstack-os-resource-classes-rebase-jobs.yml
@@ -0,0 +1,26 @@
+---
+# ============LICENSE_START=======================================================
+#  Copyright (C) 2019 Nordix Foundation.
+# ================================================================================
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# SPDX-License-Identifier: Apache-2.0
+# ============LICENSE_END=========================================================
+#
+- project:
+    name: openstack-os-resource-classes-rebase
+    project: openstack/os-resource-classes
+    project-name: openstack-os-resource-classes
+
+    jobs:
+      - 'opendev-{project-name}-rebase'
\ No newline at end of file
diff --git a/jjb/opendev/openstack-os-traits/openstack-os-traits-push-upstream-jobs.yml b/jjb/opendev/openstack-os-traits/openstack-os-traits-push-upstream-jobs.yml
new file mode 100644
index 0000000..96ea9d3
--- /dev/null
+++ b/jjb/opendev/openstack-os-traits/openstack-os-traits-push-upstream-jobs.yml
@@ -0,0 +1,26 @@
+---
+# ============LICENSE_START=======================================================
+#  Copyright (C) 2019 Nordix Foundation.
+# ================================================================================
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# SPDX-License-Identifier: Apache-2.0
+# ============LICENSE_END=========================================================
+#
+- project:
+    name: openstack-os-traits-push-upstream
+    project: openstack/os-traits
+    project-name: openstack-os-traits
+
+    jobs:
+      - 'opendev-{project-name}-push-upstream'
\ No newline at end of file
diff --git a/jjb/opendev/openstack-os-traits/openstack-os-traits-rebase-jobs.yml b/jjb/opendev/openstack-os-traits/openstack-os-traits-rebase-jobs.yml
new file mode 100644
index 0000000..3b59ed8
--- /dev/null
+++ b/jjb/opendev/openstack-os-traits/openstack-os-traits-rebase-jobs.yml
@@ -0,0 +1,26 @@
+---
+# ============LICENSE_START=======================================================
+#  Copyright (C) 2019 Nordix Foundation.
+# ================================================================================
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# SPDX-License-Identifier: Apache-2.0
+# ============LICENSE_END=========================================================
+#
+- project:
+    name: openstack-os-traits-rebase
+    project: openstack/os-traits
+    project-name: openstack-os-traits
+
+    jobs:
+      - 'opendev-{project-name}-rebase'
\ No newline at end of file
diff --git a/jjb/opendev/rebase-jobs.sh b/jjb/opendev/rebase-jobs.sh
index b223f90..90b84c2 100755
--- a/jjb/opendev/rebase-jobs.sh
+++ b/jjb/opendev/rebase-jobs.sh
@@ -4,6 +4,11 @@
 set -o pipefail
 
 cd $WORKSPACE
+# Make sure the Nordix is set from Jenkins Job configuration
+# parameter: NORDIX_REMOTE and not from previous job execution
+if git remote | grep nordix > /dev/null ; then
+    git remote rm nordix
+fi
 # When the GERRIT_BRANCH is not set the rebase job wasn't triggered by merge
 # but it's executed as part of timer. In this case we will make sure that all
 # branches from remote are synced with Nordix Gerrit.
@@ -33,8 +38,3 @@
 echo "-- Pushing changes to Nordix Gerrit --"
 git push nordix --all -v
 echo "--------------------------------------------------------------------"
-# Make sure the Nordix is set from Jenkins Job configuration
-# parameter: NORDIX_REMOTE in next job run
-if git remote | grep nordix > /dev/null ; then
-    git remote rm nordix
-fi