diff --git a/src/pages/TestRepositoryFeed.vue b/src/pages/TestRepositoryFeed.vue
index 8925086..58a238f 100644
--- a/src/pages/TestRepositoryFeed.vue
+++ b/src/pages/TestRepositoryFeed.vue
@@ -138,6 +138,12 @@
             label="Tests prefix"
             hint="Enter a tests prefix for a new test repository"
           />
+          <q-select
+            v-model="current_team"
+            label="Select team*"
+            :rules="[(val) => !!val || 'Team name is required']"
+            :options="userTeams"
+          />
         </q-card-section>
         <q-card-actions align="right">
           <q-btn
@@ -241,9 +247,9 @@
 </template>
 
 <script>
-  import {Notify} from "quasar"
-  import {defineComponent, ref} from "vue"
-  import {pathJoin} from "../utils"
+  import {Notify} from 'quasar'
+  import {defineComponent, ref} from 'vue'
+  import {getFromApi, pathJoin} from '../utils'
 
   export default defineComponent({
     data() {
@@ -257,52 +263,54 @@
         testRepositories: [],
         columns: [
           {
-            name: "name",
+            name: 'name',
             required: true,
-            align: "left",
-            label: "Name",
-            field: "name",
+            align: 'left',
+            label: 'Name',
+            field: 'name',
           },
           {
-            name: "url",
+            name: 'url',
             required: true,
-            align: "center",
-            label: "URL",
-            field: "url",
+            align: 'center',
+            label: 'URL',
+            field: 'url',
           },
           {
-            name: "tests_dir",
+            name: 'tests_dir',
             required: true,
-            align: "left",
-            label: "Tests directory",
-            field: "tests_dir",
+            align: 'left',
+            label: 'Tests directory',
+            field: 'tests_dir',
           },
           {
-            name: "packages",
+            name: 'packages',
             required: false,
-            align: "center",
-            label: "Packages",
-            field: "packages",
+            align: 'center',
+            label: 'Packages',
+            field: 'packages',
           },
         ],
         addNewtestRepositories: false,
         configureTestRepositories: false,
-        newtestRepositoriesName: "",
-        newtestRepositoriesUrl: "",
-        newtestRepositoriesDir: "",
-        newtestRepositoriesPrefix: "",
+        newtestRepositoriesName: '',
+        newtestRepositoriesUrl: '',
+        newtestRepositoriesDir: '',
+        newtestRepositoriesPrefix: '',
         addLoading: false,
-        search: "",
+        search: '',
+        current_team: null,
+        userTeams: [],
       }
     },
     created() {
-      this.search = this.$route.query.name ? this.$route.query.name : ""
+      this.search = this.$route.query.name ? this.$route.query.name : ''
       this.loadFeedPage(this.search)
     },
     computed: {
       testRepositoriesPageNumber() {
         return this.$store.getters[
-          "testRepositories/testRepositoriesPageNumber"
+          'testRepositories/testRepositoriesPageNumber'
         ]
       },
       currentPage: {
@@ -310,7 +318,7 @@
           return this.$store.state.testRepositories.pageNumber
         },
         set(value) {
-          this.$store.commit("testRepositories/setPageNumber", value)
+          this.$store.commit('testRepositories/setPageNumber', value)
           this.loadFeedPage()
         },
       },
@@ -320,35 +328,35 @@
         return pathJoin([repo.url, repo.tests_dir])
       },
       resetFilter() {
-        this.search = ""
+        this.search = ''
         this.$refs.searchField.blur()
         if (this.$route.query.name) {
           this.loadFeedPage()
-          this.$router.replace({name: "TestRepositoriesFeed"})
+          this.$router.replace({name: 'TestRepositoriesFeed'})
         }
       },
       searchRepos() {
         this.$refs.searchField.focus()
-        let query = this.$route.query.name ? this.$route.query.name : ""
+        let query = this.$route.query.name ? this.$route.query.name : ''
         if (this.search === query) return
 
         if (this.search) {
           this.$router.push({
-            name: "TestRepositoriesFeed",
+            name: 'TestRepositoriesFeed',
             query: {name: this.search},
           })
         } else {
-          this.$router.replace({name: "TestRepositoriesFeed"})
+          this.$router.replace({name: 'TestRepositoriesFeed'})
         }
         this.loadFeedPage(this.search)
       },
-      loadFeedPage(name = "") {
+      loadFeedPage(name = '') {
         this.loading = true
         let query = {
           pageNumber: this.testRepositoriesPageNumber,
         }
         if (name) {
-          query["name"] = name
+          query['name'] = name
           this.loadingSearch = true
         }
         this.$api
@@ -358,7 +366,7 @@
             this.loadingSearch = false
             this.testRepositories = response.data.test_repositories
             this.totalPages = Math.ceil(
-              response.data["total_test_repositories"] / 10
+              response.data['total_test_repositories'] / 10
             )
           })
           .catch((error) => {
@@ -366,10 +374,22 @@
             this.loadingSearch = false
             Notify.create({
               message: `${error.response.status}: ${error.response.statusText}`,
-              type: "negative",
-              actions: [{label: "Dismiss", color: "white", handler: () => {}}],
+              type: 'negative',
+              actions: [{label: 'Dismiss', color: 'white', handler: () => {}}],
+            })
+          })
+        let currentUserID = this.$store.state.users.self.user_id
+        this.userTeams = []
+        getFromApi(this.$api, `/users/${currentUserID}/teams`)
+          .then((teams) => {
+            teams.forEach((team) => {
+              this.userTeams.push({
+                label: team.name,
+                id: team.id,
+              })
             })
           })
+          .catch()
       },
       newtestRepositories() {
         this.addLoading = true
@@ -378,6 +398,7 @@
           url: this.newtestRepositoriesUrl,
           tests_dir: this.newtestRepositoriesDir,
           tests_prefix: this.newtestRepositoriesPrefix,
+          team_id: this.current_team.id,
         }
         this.$api
           .post(`/test_repositories/create/`, data)
@@ -385,27 +406,27 @@
             this.addLoading = false
             this.addNewtestRepositories = false
             this.loadFeedPage()
-            this.newtestRepositoriesName = ""
-            this.newtestRepositoriesUrl = ""
-            this.newtestRepositoriesDir = ""
-            this.newtestRepositoriesPrefix = ""
+            this.newtestRepositoriesName = ''
+            this.newtestRepositoriesUrl = ''
+            this.newtestRepositoriesDir = ''
+            this.newtestRepositoriesPrefix = ''
           })
           .catch((error) => {
             this.addLoading = false
             if (+String(error.response.status)[0] === 4) {
               Notify.create({
                 message: error.response.data.detail,
-                type: "negative",
+                type: 'negative',
                 actions: [
-                  {label: "Dismiss", color: "white", handler: () => {}},
+                  {label: 'Dismiss', color: 'white', handler: () => {}},
                 ],
               })
             } else {
               Notify.create({
                 message: `${error.response.status}: ${error.response.statusText}`,
-                type: "negative",
+                type: 'negative',
                 actions: [
-                  {label: "Dismiss", color: "white", handler: () => {}},
+                  {label: 'Dismiss', color: 'white', handler: () => {}},
                 ],
               })
             }
@@ -438,17 +459,17 @@
             if (+String(error.response.status)[0] === 4) {
               Notify.create({
                 message: error.response.data.detail,
-                type: "negative",
+                type: 'negative',
                 actions: [
-                  {label: "Dismiss", color: "white", handler: () => {}},
+                  {label: 'Dismiss', color: 'white', handler: () => {}},
                 ],
               })
             } else {
               Notify.create({
                 message: `${error.response.status}: ${error.response.statusText}`,
-                type: "negative",
+                type: 'negative',
                 actions: [
-                  {label: "Dismiss", color: "white", handler: () => {}},
+                  {label: 'Dismiss', color: 'white', handler: () => {}},
                 ],
               })
             }