diff --git a/api/v1alpha1/agent/spec.gen.go b/api/v1alpha1/agent/spec.gen.go
index 1a2e69a..14d6012 100644
--- a/api/v1alpha1/agent/spec.gen.go
+++ b/api/v1alpha1/agent/spec.gen.go
@@ -19,29 +19,28 @@ import (
 // Base64 encoded, gzipped, json marshaled Swagger object
 var swaggerSpec = []string{
 
-	"H4sIAAAAAAAC/+RYTW/jNhD9KwLbo2w56fbiW+Luh7FNGiTI7iHwgZHGEjcSyZKjGGng/16QFG3ZomVt",
-	"mixa9GaLw5nh45t5Iz2TVFRScOCoyfSZ6LSAitqfZzlwvEGKtb6VGUUwD6USEhQysCapggw4MlreqtI8",
-	"wCcJZEo0KsZzso4Jy4KPtXXbszTnSxFcfgSlmeCBtXVMFPxZMwUZmd75EDsO472MbX5bn4vY+xT33yBF",
-	"E++9UkJ1T16B1jS3kGSgU8Uk2qycfeSX4yNJervFOiZzvlS0GymjSDUK5f4xhEp3jZYKYEYlTRk+fTxv",
-	"gcM4Qg7KnAQF0vKokX1yDFu72vUY7+cRArR5QJWiT+Z/ITReiRUoQzV3GpplzMBJy6udUx5Kt+XdeNNX",
-	"oGZlrRHUDmQHt29y4YAroR76kM4e9YphWgTJyWkFwQUPK/C6asjJM6oM+TJmzO5rBPvPu49JzXUtpVBm",
-	"YREHKqGkfJ4Nviyb25ALcbfq8NM9VPpkoA6t78ffGu87795Xlw+tW4nbxRA6ypw/Akehnrr3xnx1/axg",
-	"Sabkp2Tb+JKm6yWuBA22KfCGPn32X2bOzOxwZOm1vtAdcHwg5yBu0gyd7YLlipqqmGtd9zYDqjVoXQHH",
-	"IBdTUe+stO61pPdQHmeUM4vbgbzbIQS7EbVKA2pCc69Cm4P1wencWJWaI1ShSKkCipCd2eMuhaookqkh",
-	"EYyQVYH27AVrY1vXViG6Zm2m9VPKG/b1B62Lz/B0RCp98+ACR6ngHFLXM1aUIeP5aCnUaKtvhk1gxSsm",
-	"OcUCjMMR48wsjrb5x6SWIxQjq/ChPnNEkGs7G3wHxntksvhaYOLDmt1EaEcLMW2fEqHSECkzHlpnuRei",
-	"BMoH337oAC3HhxPrH6Ys/edvR7/9tFsM8KFDqfse1+2oA7SHHfB5cQ3aQnKugD5kYsW7/gumUeSKVuGZ",
-	"6DulvWL8Cy1rCFtrBDlAyjZOmh1OkMJNzwhdj3p+EMp1dHpfwlC7rwyLr1RxxnPdv+dSYL/7vZNtwfap",
-	"B/M8mtShDMIsCIhXKuuZH3b7xbRLobWdph5mXuBeuN/Nxi/YXHmJbt9Rn599TTcS0YbtGqgW/CVuxD8d",
-	"pOWrjeSKVi9G9FgVDSqh4fUTmlxJN1S8Zak/3oY5bQraa9iF8sAFh7jTLZm17fxOh0uWAtf22G6qIGeS",
-	"pgVEp+OJ0UnzPk4KRKmnSbJarcbULo+FypNmr05+n8/eX968H52OJ+MCq9JCxtCguZ03o6uScg4qOrua",
-	"R6PIakUEPJOC2TNu3shJzTNYMg6ZZaAETiUjU/LLeDI+MThQLCzsCZUseTxJ3MCXPLNsnWzHHFlj97Xa",
-	"6X7krCKxjLAAlwqxoRr+Z2RKnL62vl7Y0IpW4F5o7vZ9z3/b8cbMM5Orn0umTuK3zEBVQ9x8KhkyLyzc",
-	"ZtB4LjIr2ang2MznVMqSpTb95Jt2Xza2rvtqpvuBZr12FNZSmPs1Dk4nky6af3w2N3Q6OTm09M7tepU0",
-	"3RcUm9luqHOaRdcOFxfz5O1j3nJaYyEU+8ux9N3JDzjoR8HBBPv1R6A6N9Map2V0A+oRVOQNY4LUdL07",
-	"N+2RhXnkK9G13mGlqECWNN2vRS0hZUsGWeR8dcry2m1rT8IDCtN79z7/M8UZmPjXu/piEj1Qra+YQYgi",
-	"/7can7x7+6CXAj+Immf/ojpvisYVegG0RPvVModAUbvlKC0gfeiU7ie3d6iytFJooi5s/tom6grdzScJ",
-	"WS/WfwcAAP//W+evQYMYAAA=",
+	"H4sIAAAAAAAC/+RYT1PjNhT/Kh61RxMHSi+5QcruZlooA8PugclB2C+xFltSpWcylPF370iyEidWHC+F",
+	"nXb2lkhP7/30e3/lF5KKUgoOHDWZvBCd5lBS+/NsCRxvkWKl72RGEcyiVEKCQgZWJFWQAUdGiztVmAV8",
+	"lkAmRKNifEnqmLAsuKyt2p6tGV+I4PYTKM0ED+zVMVHwV8UUZGRy701sKYx3EFt8G53z2OsUD18hRWPv",
+	"QimhujcvQWu6tJRkoFPFJFpUTj7y2/EBkF5uXsdkxheKdi1lFKlGodw/hlDqrtBCAUyppCnD54/nLXIY",
+	"R1iCMjdBgbQ4KGRXDnFrd7sa410cIUKbBaoUfTb/c6HxWqxAmVBzt6FZxgydtLjeuuU+uC3tRpu+BjUt",
+	"Ko2gtijbe3yNhQOuhHrsYzp70iuGaR4MTk5LCG54WoFXZROcPKPKBF/GjNhDhWD/efUxqbiupBTKbMzj",
+	"QCYUlM+ywc6y2IY4xHnV8ad7QumToTq0v2t/I7yrvOuvbjy0vBK3kyF0lRl/Ao5CPXf9xnx2/axgQSbk",
+	"p2RT+JKm6iUuBQ23KfAmfPrkP0+dmDnhgqVX+lJ3yPGGnIK4gRm62yVbKmqyYqZ11VsMqNagdQkcg7GY",
+	"imprp+XXgj5AcTiinFjcNuTVDgmwW1GpNNBN6NJ3ofXF+uh0amyXmiGUIUupAoqQndnrLoQqKZKJCSI4",
+	"QlYGyrNvWGvZqrIdoivWjrT+kPKCdUwq20e/Ac8O8RbL5lJthSHidxkKRYpImdHQcvqDEAVQPpiMEMaW",
+	"4v3A+mcLGw2z9/PGLuz1Trw2HYLuU75bYAaUYrZH5+UNaEvJuQL6mIkV7+rPmUaxVLQMjwjf2OlKxj/T",
+	"ooKwtEaQAyr7WklzwtXncA0wdb+nmXwQyhU4+lDAULkvDPMvVHHGl7r/zJXAfvU7N9uQ7aEHcR4EtQ9B",
+	"OAoCtTyV1dTPfv29pRtCtR0uHqe+3r/yvBsVX3G49B2r7aM+PbstzkxUbdpugGrBX6NG/Nu5Ur7ZhKpo",
+	"+WpGD2XRoBQanj+hQY50TcWbKPXXW0dOOwStG7ap3OPgUOx0U6a2ld+9EwuWAtf22m4IJ2eSpjlEJ6Ox",
+	"6ZPmeUpyRKknSbJarUbUbo+EWibNWZ38MZteXN1eHJ2MxqMcy8JSxtCwuRm/ouuCcg4qOrueRUeR7RUR",
+	"8EwKZu+4fqCSimewYBwyG4ESOJWMTMgvo/Ho2PBAMbe0J1Sy5Ok4cfNP8sKyOtk8kGWF3Vem6/uRk4rE",
+	"IsIcHBRiTTXxn5EJcf219Zi3phUtwc3397u6Z79taWNmzWD1b4iJa/GbyEBVQdx8ORgyL8zdYdB4LjLb",
+	"slPBsRlXqZQFSy385Kt2D/2N6r6c6X6vqGsXwloK41+j4GQ87rL55+/GQyfj431bp+7Um8B0HxQssm1T",
+	"5zSLbhwvzubx+9u847TCXCj2t4vS0+PvcNGPgoMx9uv3YHVmpjVOi+gW1BOoyAvGBKmpevdu2iNzs+Qz",
+	"0ZXeYamoQBY03c1FLSFlCwZZ5HR10vLGHWtPwgMS02v3Ov83yRmY+Ovt/mKA7snWN0QQCpEfLcfHp+9v",
+	"9ErgB1Hx7D+U503SuETPgRZoP+ItIZDUbjtKc0gfO6n7yZ0d2llaEBqrc4tfW6Au0d18kpB6Xv8TAAD/",
+	"/wejlOySFwAA",
 }
 
 // GetSwagger returns the content of the embedded swagger specification file
diff --git a/api/v1alpha1/spec.gen.go b/api/v1alpha1/spec.gen.go
index 6512652..78ec427 100644
--- a/api/v1alpha1/spec.gen.go
+++ b/api/v1alpha1/spec.gen.go
@@ -18,37 +18,37 @@ import (
 // Base64 encoded, gzipped, json marshaled Swagger object
 var swaggerSpec = []string{
 
-	"H4sIAAAAAAAC/+xYUXPbNhL+Kxj0Zu6FkpxcbuZGb4qbNJo2iSdu3YfED2twJaImAQZYSuPL6L/fACAl",
-	"SoQo2k3cXMdvEgEsdr/9dvEBX7jQRakVKrJ8+oVbkWEB/udsiYrcj9LoEg1J9J/BWi0kEKbuH92VyKf8",
-	"RuscQfFNwoVBNzjzSxfaFEB8ylMgHJEskCfNGktGqmW9JEVFEvLfTN6yupuRYo73NCrTqCWrKyNwfmSQ",
-	"gCofJaqq4NOPXGkaCa0UChdwwtcgSarlaKHNaOe25QlHY7ThCV8CZegMjqSSbnAk1QoVaXPHE16VI9Ij",
-	"5zhvfBkttUJ+nRxzZ64WOuptVab3RXqFxkqtIuY2CTf4uZLG5fWjQ28Lx54jh9lqJ7ztUtImym7jXZj6",
-	"5g8U5JzyRPtFWh+HJCx8Bv5hcMGn/IfJjqCTmp2TQM3N1hYYA3fu/yufhA5nC7QWluh+pmiFkSV5FMJ8",
-	"1gwnJ0Bp5l1vEj5XCwPdnVIgsKRN+LcNZn/SwiCeQwlC0t1PL1vJkIpwicZHpgnyk5P8l1O59KNdi8mh",
-	"H7HcHAKcaUsXeo3mkoDqhpCm0sEJ+cVelMfcbVl31uwFmvO8soRmD7Kjy7e+KKS1Nrd9SKcru5Yksmj9",
-	"KCgwOtDA2jQBS6BSMI7HqXTTbqrA6q35hFfKVmWpjRuI1fIqBxXtOvFked+GJCRkNeBne6j0xkEdGz/c",
-	"fzf50Hg3X10+tLKStIshFsp82xc7eZNNdfV1gVCCDluBqqZP3/yr8zDNrTjdY67e2g44zUbBQFK7GYvt",
-	"rVwacFUxt7bqbQZgLVpb1Gdt92zU1d5IK6853GB+mlFhWtLeqDE7hGCX/pCK+L1sNMOglh3M+MY9Jyxi",
-	"Oz1AOYRDfju3qvy51Z3WZlo/pZqJff3B2uxnvPvrFcRjaIaYLvDA9MiDiByIMe2QEveWmoOyHwugZfi4",
-	"Y+c+kK5XR2hxsM/RBh6M30vu1CUYK84t3fZ1TfjOpGXADFJlFFtBXiFbaMME5LlllAGxVKt/UjNDO9qx",
-	"4Kkd82SoiJqxrCpAjQxCCjc5stYw0wtGGbJAkfBPWubs+vY4jpWrQbBBpB5uVIDIpMKjW62zu4MNHAZS",
-	"eR8+8dcg88rgJ177M2bz2qGAjrQMi5KcDTT+r9JMqsAwZwxWIHO38ZjN2AfvJhM5GLmQaBko9ubXXy+a",
-	"YIVOkd1UDmV0lojpFRojU2SSooHb/nTWWO7AY+8VMr2Ysk/8shICrf3EmTbtSMfsrXahqIWesoyotNPJ",
-	"ZClpfPsfO5ba0a2olKS7idAqSBtt7CTFFeYTK5cjMCKThIIqgxMopWtmrhtJrey4SH+wJYoRqHS0bQfd",
-	"wugUQXMUdw/+dNDdJFZYV28/YLhRvTQIt6leq679TFrSSwNFXLrfU4EWUl054sRnW8JygOLaGqlXBN0U",
-	"P5udHusRea+1CcLDUXTovN8lZb+DUVItbf+ad5r6zR9EtgO7cT3q50mnjnkQZ0FEY4myOm/uZP2ar0uh",
-	"jRf9t+eNDnvg+nCFe8DiolGS7Rz12TmUnk7JtGELbeshZvSfve+VX+3maKB4MKKnqmhQCQ2vn9gFi3e3",
-	"SnYsbcLbMqdNQZ+GfSiPJDjGnW7JbLw+DnIxlwKVxZ3K4bMSRIbs+fjMyTmT8ylvDpH1ej0GPzzWZjmp",
-	"19rJL/PzV+8uX42ej8/GGRW5h0ySQ3N3LWIXOSiFhs0u5q3noSmvVIoLqTD1hCtRQSn5lP9rfDZ+5sIG",
-	"yjzK7iiarJ5NdteQJVL35MylJVbP8fZqTqd8yp0GmzVDBm2pnf/OxvOzM982tKL6XgZlmUvh107+qMVJ",
-	"oNmgtyov9zzU++69/9mF+eLs2VfbLryARbb6TUFFmTbyvwHbf3/FGI9uOnenvIKcXaJZoWHNxIQTuGr5",
-	"GK6R/Np92k/p5ItMNyGhOVJEdobvTnQFG4fp/dGPz+qxEgwUGB5JPh6amv/YaKvGlHSfHdma68403Bx2",
-	"lUymwqSFz6lryPW35lgfvx4h1S8hZR/wc4WW/jJOvzh78e03fafpta7Ud15EsqjvatG2uETydH9/NWNh",
-	"5mH1/IQ0rwd6S6esbnIp2OXlG3aLd03lfK7QP1bUpVM/mLTL5c+VhxaENLJkMCj5SBneSAXeh8OdOvjO",
-	"VAuHp3L5+5dLyPT1JuEZQtqtDvf1RHm8QUi/h/oYxOQhzBvElJOZfWgmWo0rCHY75ORnQuc5iubxp1kZ",
-	"FwKX29FvdgzXr3Hfk85rYR3g8bQ/LpWPYegE7GMguHsc/d5R7FJ2sGKtUe4l6nDJujX2/6VZm0ftJ9H6",
-	"uKfwPTqCac5BW6KQC4npMeZ+QEifePvE20fmrevBGUJO2dGbThhmIkNxG1NxuafdaWnlkttyod712rts",
-	"vbwJbA9vZBO+ud78LwAA//+CrTRXXCcAAA==",
+	"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",
+	"AAAA//+FHN/SayYAAA==",
 }
 
 // GetSwagger returns the content of the embedded swagger specification file
diff --git a/api/v1alpha1/types.gen.go b/api/v1alpha1/types.gen.go
index 8e86fdf..9febfe4 100644
--- a/api/v1alpha1/types.gen.go
+++ b/api/v1alpha1/types.gen.go
@@ -27,15 +27,6 @@ const (
 	Unsupported InfraNetworksType = "unsupported"
 )
 
-// Defines values for SourceStatus.
-const (
-	SourceStatusError                     SourceStatus = "error"
-	SourceStatusGatheringInitialInventory SourceStatus = "gathering-initial-inventory"
-	SourceStatusNotConnected              SourceStatus = "not-connected"
-	SourceStatusUpToDate                  SourceStatus = "up-to-date"
-	SourceStatusWaitingForCredentials     SourceStatus = "waiting-for-credentials"
-)
-
 // Agent defines model for Agent.
 type Agent struct {
 	Associated    bool        `json:"associated"`
@@ -100,20 +91,13 @@ type MigrationIssues = []struct {
 
 // Source defines model for Source.
 type Source struct {
-	Agents     *[]SourceAgentItem `json:"agents,omitempty"`
-	CreatedAt  time.Time          `json:"createdAt"`
-	Id         openapi_types.UUID `json:"id"`
-	Inventory  *Inventory         `json:"inventory,omitempty"`
-	Name       string             `json:"name"`
-	SshKey     *string            `json:"sshKey,omitempty"`
-	Status     SourceStatus       `json:"status"`
-	StatusInfo string             `json:"statusInfo"`
-	UpdatedAt  time.Time          `json:"updatedAt"`
+	Agents    *[]SourceAgentItem `json:"agents,omitempty"`
+	CreatedAt time.Time          `json:"createdAt"`
+	Id        openapi_types.UUID `json:"id"`
+	Inventory *Inventory         `json:"inventory,omitempty"`
+	UpdatedAt time.Time          `json:"updatedAt"`
 }
 
-// SourceStatus defines model for Source.Status.
-type SourceStatus string
-
 // SourceAgentItem defines model for SourceAgentItem.
 type SourceAgentItem struct {
 	Associated bool               `json:"associated"`
diff --git a/internal/cli/get.go b/internal/cli/get.go
index ec861ef..d55cb7c 100644
--- a/internal/cli/get.go
+++ b/internal/cli/get.go
@@ -165,8 +165,8 @@ func printTable(response interface{}, kind string, id *uuid.UUID) error {
 }
 
 func printSourcesTable(w *tabwriter.Writer, sources ...api.Source) {
-	fmt.Fprintln(w, "ID\tNAME\tSTATUS")
+	fmt.Fprintln(w, "ID")
 	for _, s := range sources {
-		fmt.Fprintf(w, "%s\t%s\t%s\n", s.Id, s.Name, s.Status)
+		fmt.Fprintf(w, "%s\n", s.Id)
 	}
 }
diff --git a/internal/store/source_test.go b/internal/store/source_test.go
index 4f32457..791fc7f 100644
--- a/internal/store/source_test.go
+++ b/internal/store/source_test.go
@@ -46,6 +46,24 @@ var _ = Describe("source store", Ordered, func() {
 			Expect(sources).To(HaveLen(2))
 		})
 
+		It("successfully list all the sources -- with agents", func() {
+			sourceID := uuid.NewString()
+			agentID := uuid.NewString()
+			tx := gormdb.Exec(fmt.Sprintf(insertAgentStm, agentID, "not-connected", "status-info-1", "cred_url-1"))
+			Expect(tx.Error).To(BeNil())
+			tx = gormdb.Exec(fmt.Sprintf(insertSourceStm, sourceID))
+			Expect(tx.Error).To(BeNil())
+			tx = gormdb.Exec(fmt.Sprintf("UPDATE agents set source_id = '%s';", sourceID))
+			Expect(tx.Error).To(BeNil())
+
+			sources, err := s.Source().List(context.TODO())
+			Expect(err).To(BeNil())
+			Expect(sources).To(HaveLen(1))
+			agents := *sources[0].Agents
+			Expect(agents).To(HaveLen(1))
+			Expect(agents[0].Id.String()).To(Equal(agentID))
+		})
+
 		It("list all sources -- no sources", func() {
 			sources, err := s.Source().List(context.TODO())
 			Expect(err).To(BeNil())
@@ -53,6 +71,7 @@ var _ = Describe("source store", Ordered, func() {
 		})
 
 		AfterEach(func() {
+			gormdb.Exec("DELETE from agents;")
 			gormdb.Exec("DELETE from sources;")
 		})
 	})